A different article on a CI-based approach, with comparison to git-flow: http://nxvl.blogspot.com/2012/07/a-continous-delivery-git-br...