feature
release branches
branches develop hotfixes master
Tag
Time
0.1
Major Severe bug
feature for fixed for
Feature
next release production:
for future hotfix 0.2
release
Incorporate
bugfix in
develop
「git-flow」
Tag
0.2
Start of
release
branch for
1.0
A successful Git branching model
From this point on,
“next release”
means the release
after 1.0
http://nvie.com/posts/a-successful-git-branching-model/ Only
bugfixes!
Bugfixes from Tag
rel. branch
may be 1.0
continuously
merged back
into develop
13