Skip to content
Snippets Groups Projects
Commit ca139e8c authored by Sytse Sijbrandij's avatar Sytse Sijbrandij
Browse files

Rewrite this section after suggestion from Achilleas.

parent fe3762fd
No related branches found
No related tags found
1 merge request!176Gitlab flow
Loading
@@ -83,8 +83,8 @@ An 'extreme' version of environment branches are setting up an environment for e
Loading
@@ -83,8 +83,8 @@ An 'extreme' version of environment branches are setting up an environment for e
   
Only in case you need to release software to the outside world you work with release branches. Only in case you need to release software to the outside world you work with release branches.
In this case, each branch contains a minor version (2-3-stable, 2-4-stable, etc.). In this case, each branch contains a minor version (2-3-stable, 2-4-stable, etc.).
The branches start from master as late as possible. The stable branch uses master as a starting point and is created as late as possible.
By not branching as late as possible you minimize the time you have to apply bugfixes to multiple branches. By branching as late as possible you minimize the time you have to apply bugfixes to multiple branches.
After a release branch is announced, only serious bug fixes are included in the release branch. After a release branch is announced, only serious bug fixes are included in the release branch.
If possible these bug fixes are first merged into master and then cherry-picked into the release branch. If possible these bug fixes are first merged into master and then cherry-picked into the release branch.
Merging them in master first ensures you do not forget to merge them into master and encounter the same bug on the next release. Merging them in master first ensures you do not forget to merge them into master and encounter the same bug on the next release.
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment