Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
ca139e8c
Commit
ca139e8c
authored
Sep 01, 2014
by
Sytse Sijbrandij
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewrite this section after suggestion from Achilleas.
parent
fe3762fd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
doc/workflow/gitlab_flow.md
doc/workflow/gitlab_flow.md
+2
-2
No files found.
doc/workflow/gitlab_flow.md
View file @
ca139e8c
...
@@ -83,8 +83,8 @@ An 'extreme' version of environment branches are setting up an environment for e
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment