I find all of these posts on &quot;the right way to use git&quot; pretty tiresome.<p>At the end of the day it&#x27;s really not that complicated and you will probably have more luck by keeping it that way. Bringing in a complex workflow that isn&#x27;t rooted in the flow of work in your organisation makes no sense.<p>Stick to master being the newest code, fixes done in a branch, review and rebase ontop of master, features the same just hang around in a branch for longer - still rebase ontop of master. Maintain branches for releases and cherry-pick from master onto them.<p>If your workflow takes a blog post to describe it&#x27;s just too damn complicated.