Branching and Merging are very powerful features in Git. There are may branching strategies, my favorite is well explained at http://nvie.com/posts/a-successful-git-branching-model/ Pick any model you like and stick to it for a while to better understand and evaluate it. If you do not like that try another one. In this model when we start to …