Switching to git-flow