Use Git Flow, it is great!
A few month ago I had problems with git branches. It was no technical
problem, it was more like a mental barrier to think about branches:
“When should I branch, how do I merge, what is running in production
and how should I create and merge hotfixes?”. These were the questions that I found hard to answer until I started
to pick up Git Flow which gave me a simple branching model. And now I
recommend it to everyone who uses git. 
See a screencast of Git Flow http://vimeo.com/16018419 Read the blog post http://nvie.com/posts/a-successful-git-branching-model/ Source Code and installation https://github.com/nvie/gitflow bash and zsh completion https://github.com/bobthecow/git-flow-completion
problem, it was more like a mental barrier to think about branches:
“When should I branch, how do I merge, what is running in production
and how should I create and merge hotfixes?”. These were the questions that I found hard to answer until I started
to pick up Git Flow which gave me a simple branching model. And now I
recommend it to everyone who uses git.
See a screencast of Git Flow http://vimeo.com/16018419 Read the blog post http://nvie.com/posts/a-successful-git-branching-model/ Source Code and installation https://github.com/nvie/gitflow bash and zsh completion https://github.com/bobthecow/git-flow-completion
