[dgoujard]

One common best practice is http://nvie.com/posts/a-successful-git-branching-model/ You can use http://danielkummer.github.io/git-flow-cheatsheet/ also to help branch handling.