Branch Management

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

1. Release branches are for bugfixes only, and should be named release/#.#.x, with a literal x. That is, all releases from the (eg) 1.0.x series come from the same branch. Bugfix release branches generally branch from master (or another release branch) not develop.
2. 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