In the enhanced Gitflow workflow diagram above ... orange -- a compromise between the blue feature and the red hotfix. Put all of these improvements together and you get the enhanced Gitflow diagram ...