diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-01 11:26:47 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-09-01 11:26:47 +0200 |
| commit | ca139e8c783bdf3dd0b8b664fbe8f416e13c9aa3 (patch) | |
| tree | 68724f50f2006c8b2eddececcd8c9432dc491b32 /doc/workflow/gitlab_flow.md | |
| parent | fe3762fd0a720e474e70e5dbd63c0821f0a08cd8 (diff) | |
| download | gitlab-ce-ca139e8c783bdf3dd0b8b664fbe8f416e13c9aa3.tar.gz | |
Rewrite this section after suggestion from Achilleas.
Diffstat (limited to 'doc/workflow/gitlab_flow.md')
| -rw-r--r-- | doc/workflow/gitlab_flow.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md index e3024339b28..127c49148c4 100644 --- a/doc/workflow/gitlab_flow.md +++ b/doc/workflow/gitlab_flow.md @@ -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. 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. -By not branching as late as possible you minimize the time you have to apply bugfixes to multiple branches. +The stable branch uses master as a starting point and is created as late as possible. +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. 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. |