Branch Management

The COmanage Project has adopted a modified version of git-flow as its branch management strategy. In short, the differences are

1. One hotfix branch exists per minor release. That is, hotfix-1.0.x is used for (eg) 1.0.1 and 1.0.2. While these will typically branch from merge into master, they may also branch from any release tag, and may not merge into master if master has already moved on to a new minor (or major) release.
2. Release branches are not currently used. All features for release merge into develop, which eventually merges into master to create a release tag.
3. Feature branches (topic branches) are optional and should be named for the corresponding JIRA issue (eg: co500).

References

• http://nvie.com/posts/a-successful-git-branching-model
• http://scottchacon.com/2011/08/31/github-flow.html