Document the new branch system in the wiki

[gak]

Using git flow now, so the "develop" is the bleeding edge, buggy branch. "master" is the stable production ready branch.

[FrMo]

Just saw that you have updated the wiki --> very clearly described :) I'm just missing the "hotfix" case, which will be very important right now; hotfixes must branch off from the master (stable) branch, and will be merged back into develop and master.

btw, please add a link to the timeline example from http://nvie.com/posts/a-successful-git-branching-model/

[FrMo]

You could also add the following rules:

• for every new feature, create a feature/ branch.
• bugfixes for the stable master branch require a or hotfix/ branch.
• features and bugfixes need a related issue that describes the problem or the intention of the change.
• after merging a branch back into develop, remaining bugs and integration problems may be resolved and directly committed into develop.