Git Branching and Merging Guidelines