Why aren't you using git-flow?
215 points by jkreeftmeijer
Read the article
Discussion on Hacker News