Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
rodlie committed May 17, 2024
1 parent 02a41e7 commit f574f63
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,17 @@ It's always preferred to submit PR's against the `main` branch. If your feature

## Branches and versions

Friction uses `X.Y.Z` version numbers and `X.Y` branches.
Friction uses `X.Y.Z` version numbers and `vX.Y` branches.

* `X` = Major
* `Y` = Minor
* `Z` = Patch

Branch `main` is always the current branch for the next `X` or `Y` release. The `main` branch should not be considered stable, but usable.

A new stable branch is cut from `main` on each `X` or `Y` release and is maintained until a new stable branch is created.
A new stable branch is cut from `main` on each `X` or `Y` release and is maintained until a new stable branch is created. The next `Z` (patch) release comes from the latest stable branch (`vX.Y`).

The next `Z` release usually comes from the latest stable branch (`vX.Y`).

Features under development should be kept in it's own branch until ready to be merged with `main`.
Bug and security fixes to `main` will be backported to active stable branches when possible (and within reason).

## Build

Expand Down

0 comments on commit f574f63

Please sign in to comment.