I don't understand what you mean by "straight line".
Either you merge your release back to the mainline (the way GitFlow, and my workflow, does), in which case the release branch contributes nothing to history, or you rebase or cherry-pick your changes from the release branch back to the mainline, which sounds like hell to me.
Unless you need to maintain completely separate versions of your software (for example, for different clients), in which case GitFlow, and thus my article, isn't really your workflow. But that is a different versioning challenge altogether.
0
u/[deleted] Jun 19 '15
[deleted]