This question is really on branching, and merging. I just got turn on to git last week and I really like it but I have some questions.. everything I read tells me never to work in the master branch. So before I make any programming changes I make a new branch and do my work and then I merge in back into the master… I don’t know if this is right so I would like to hear from others.
But how do I handled code going to staging, and production? Do I just tag code in the master or do I make a production branch for each releases.
Please can someone please tell me how to you handled working with code moving to staging, testing and production… Do you use tags or branches or both.
There are plenty of models out there: Your version control setup can be as simple or as complicated as you need it to be. Here’s one popular methodology: http://nvie.com/posts/a-successful-git-branching-model/
Personally I use a new branch for each feature/bug, then merge into master like you have been doing. Then simply tag for production releases with staging servers running off master.
If you need something more complicated, you can do something like the aforementioned Git Flow technique, which has release branches etc. but if you don’t need it, then you don’t have to do it.