Integrated git-flow