git-flow has worked well in this regard for me.