dev ---> dev ------> merge --> dev ---------->
\-- 1.0 ---> {tag} --/ /
\---- 1.1 ---> {tag} --/ /
\ /
\---------> 1.2 ---> {tag} --- /
vs.
dev ---> dev ------> merge --> dev --------------------->
\-- 1.0 ------ / --- commit -- / -- commit bugfix -- /
i think what he means is the second one, having a linear branch is far easier to understand and use than having tags and re-creating branches etc.
if i can chime in, if you are developing an application (like an ios application etc) and need to bump version everytime it completely make sense, tags are like snapshots you cant change it, and when you release your software, you cant update without releasing a new version.
on the other hand, if you are building applications on the server side or (maybe web frontend), and deploy a dozen of times everyday, its a nightmare to tag and rebranch.
Sorry, I have no idea what that second drawing means.
If you are deploying several times a day, I would imagine you do it straight from the mainline, and you don't bother with tagging your releases. If that's true, then you also for sure don't bother with separate branches for each release, so I'm not sure what you're arguing here.
And I don't know what you mean by "rebranching". Like I said, you only have one eternal branch in your repo with this workflow. There's no "rebranching".
im not arguing, i just wanted to say, if you are versioning your application, than what you suggest makes perfect sense. but if you arent versioning there is no need to tag branches. you can just have something like a development, staging, production branches and some feature branches. and there is no need to tag anything.
if what you are working on will block other developers - maybe an api endpoint change etc. you create a branch from development, name it like "super login ui" then merge it to staging (so deploys to staging servers) so others/customer can take a look. if everyones ok, merge to development, and then merge to production. if not, eg. customer wants some changes etc. you make those changes on your feature branch, and merge to staging.
so you have at least 3 branches that lives forever, and a bunch of feature branches.
i think there is no "one size fits all" type workflow at all. and honestly, i hate branches and tags all together, it just complicates things, creates lots of arguing about the best workflow and doesnt offer much - but thats another topic.
I agree that if you're full-on Continuous Delivery (every change that passes tests gets deployed), then tagging your versions makes no sense. Same for your 3 "environment" branches. But you're no longer using GitFlow at that point, so it's OK by me :).
4
u/ybrs Jun 19 '15
vs.
i think what he means is the second one, having a linear branch is far easier to understand and use than having tags and re-creating branches etc.
if i can chime in, if you are developing an application (like an ios application etc) and need to bump version everytime it completely make sense, tags are like snapshots you cant change it, and when you release your software, you cant update without releasing a new version.
on the other hand, if you are building applications on the server side or (maybe web frontend), and deploy a dozen of times everyday, its a nightmare to tag and rebranch.