Interestingly enough, I was just documenting my team's workflow in my blog... http://www.skuunk.com/2014/01/our-git-workflow.html http://www.skuunk.com/2014/01

Interestingly enough, I was just documenting my team's workflow in my blog... http://www.skuunk.com/2014/01/our-git-workflow.html http://www.skuunk.com/2014/01/our-git-workflow.html Very similar to this, but we add a couple of steps to allow a business owner to examine a feature before it gets accepted and also we use an integration branch to deal with merge conflicts before creating a releasable master branch.