Git Branching Strategy
From Gcube Wiki
Revision as of 04:16, 24 May 2019 by Manuele.simi (Talk | contribs)
- 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
- 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.