r/programming • • Jun 19 '15

GitFlow considered harmful

http://endoflineblog.com/gitflow-considered-harmful
13 Upvotes

244 comments sorted by

View all comments

Show parent comments

0

u/[deleted] Jun 19 '15

[deleted]

-18

u/skinny85 Jun 19 '15

Or... I could just leave the branch there... Can you imagine trying to track the history of bugfixes for a release product if you're deleting the branch each time and just going off merges into master. Holy mary mother of god that sounds scary.

The tag tracks that history. Trust me, it's no problem at all.

BTW, I feel like you're resorting to "I'm no worse than GitFlow", but I've never used GitFlow so that's not compelling for me :/

I can just say, "Lucky you" :). I like to think my workflow is superior to GitFlow in every way - I'm not sure how I implied I'm merely no worse, that wasn't my intention.

0

u/[deleted] Jun 19 '15

[deleted]

6

u/elperroborrachotoo Jun 19 '15

I don't know what the gitflow fuzz is about, and I prefer to "fix in develop, carry successful fixes to release branch".

Yet I don't see your problem either.

Let me try:

dev  ---> dev ------>  merge --> dev --->
  \-- 1.0 ---> {tag} --/

Oops! Bug in 1.0

dev  ---> dev ------>  merge --> dev --->
  \-- 1.0 ---> {tag} --/
                 \---- 1.1 ---> ...

4

u/ybrs Jun 19 '15
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.

0

u/[deleted] Jun 19 '15

[deleted]

→ More replies (0)

1

u/elperroborrachotoo Jun 19 '15

having a linear branch is far easier to understand

Yeah, sure, which is what I prefer. But hey, there must be a clever reason all those smart people don't do it that way... right? RIGHT?

I just wanted to illustrate how I understand the tag method.

-3

u/skinny85 Jun 19 '15

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".

→ More replies (0)

2

u/skinny85 Jun 19 '15

Yep, that's exactly how it works, and what I explained in the comment above.