Skip to content
Snippets Groups Projects
Commit 1335a83a authored by Fernando Mayer's avatar Fernando Mayer
Browse files

Rewrite information about the release branch

parent 1ae0b462
No related branches found
No related tags found
No related merge requests found
...@@ -16,11 +16,11 @@ two links: [A successful Git branching model][], and ...@@ -16,11 +16,11 @@ two links: [A successful Git branching model][], and
Basically, all the ongoing development is made in the `devel` Basically, all the ongoing development is made in the `devel`
branch. New features and bug fixes are made in additional (parallell) branch. New features and bug fixes are made in additional (parallell)
branches such like `feature/<num>`, where `<num>` is an incremental branches such like `feature/<num>`, where `<num>` is an incremental
number. Feature branches are merged with the `devel` branch. When a new number. Feature branches are merged with the `devel` branch, where final
version is supposed to be ready for release, it is moved to the tests are made to guarantee it is stable. Only then it is moved to the
`release` branch, where final tests are made to guarantee it is `master` branch, where it receives a tag with the version number. Note
stable. Only then it is moved to the `master` branch, where it receives that we don't use a `release` branch as in a traditional Gitflow
a tag with the version number. workflow (this is the only difference).
This way, users may opt to install the stable version, from the `master` This way, users may opt to install the stable version, from the `master`
branch, or they may install the development version from the `devel` branch, or they may install the development version from the `devel`
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment