Difference between revisions of "Git Branching Strategy"
From Gcube Wiki
Manuele.simi (Talk | contribs) |
Manuele.simi (Talk | contribs) |
||
Line 6: | Line 6: | ||
* If an issue (typically a bug requiring immediate attention) in ''master'' is detected a ''hotfix/issue'' branch is created from ''master'' | * If an issue (typically a bug requiring immediate attention) in ''master'' is detected a ''hotfix/issue'' branch is created from ''master'' | ||
* Once the hotfix is complete it is merged to both ''dev'' and ''master'' | * Once the hotfix is complete it is merged to both ''dev'' and ''master'' | ||
+ | |||
+ | [[File:Git Branching strategy.png|800px]] | ||
''Back to the [[Continuous_Integration_procedure_(2019) | CI guide]].'' | ''Back to the [[Continuous_Integration_procedure_(2019) | CI guide]].'' |
Revision as of 05:05, 24 May 2019
- The master branch is the stable branch
- One (and only one) develop (dev) branch is created from master
- Feature (feature/issue) branches are created from dev
- When a feature is complete it is merged into the dev branch
- When dev has enough stable features to release it is merged into master
- If an issue (typically a bug requiring immediate attention) in master is detected a hotfix/issue branch is created from master
- Once the hotfix is complete it is merged to both dev and master
Back to the CI guide.