Agreed. Might as well mention the tool while we're here: https://github.com/nvie/gitflow

I did just enter a shop where git is new to a lot of people. Kind of blew my mind but I've been in startup land for years and just came back to enterprise development.

Yup, see this summary from 623 days ago: https://news.ycombinator.com/item?id=3446367

I'm still happy I posted this however, the comments on this subject inside this thread so far are pretty useful.