Difference between revisions of "Git Branching Strategy"
From Gcube Wiki
Manuele.simi (Talk | contribs) m (Manuele.simi moved page Branching Strategy to Git Branching Strategy) |
Manuele.simi (Talk | contribs) |
||
| (3 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
* The ''master'' branch is the stable branch | * The ''master'' branch is the stable branch | ||
* One (and only one) develop (named ''dev'') branch is created from ''master'' | * One (and only one) develop (named ''dev'') branch is created from ''master'' | ||
| − | * Feature (named ''feature/issue'') branches are created from ''dev'' | + | * Feature (named ''feature/issue'') branches are created from ''dev'' (issue is the tracker issue number that describes the feature) |
* When a ''feature'' is complete it is merged into the ''dev'' branch | * 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'' | * 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'' | + | * If an issue (typically a bug requiring immediate attention) in ''master'' is detected a ''hotfix/issue'' branch is created from ''master'' (issue is the tracker issue number that reports the problem) |
| − | * 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. | + | [[File:Git Branching strategy.v4.png|800px]] |
''Back to the [[Continuous_Integration_procedure_(2019) | CI guide]].'' | ''Back to the [[Continuous_Integration_procedure_(2019) | CI guide]].'' | ||
Revision as of 05:37, 24 May 2019
- The master branch is the stable branch
- One (and only one) develop (named dev) branch is created from master
- Feature (named feature/issue) branches are created from dev (issue is the tracker issue number that describes the feature)
- 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 (issue is the tracker issue number that reports the problem)
- Once the hotfix is complete it is merged to both dev and master
Back to the CI guide.
