r/git • • Jun 19 '15

GitFlow considered harmful

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

3 comments sorted by

13

u/cpbills Jun 19 '15 edited Jun 19 '15

I dislike merge commits, and personally prefer to rebase feature branches into other branches, but it seems like the Author's (first) complaint could be alleviated by rebasing the feature branches on the branch they're to merge with, then merging with --no-ff, which would result in a cleaner graph.

edit:

The Author's gripes seem valid if there's no caretaker / maintainer of the repository. Sounds like they either need to step up to be that maintainer, or something.

You could of course say that all of these mistakes are the result of human error, and if the same people just read the documentation and learned from their experiences, everything would be fine. But I have seen these mistakes being made so many times, by otherwise competent developers, that I don't buy this argument.

I can, and I will. 'Competent' developers will listen to someone who's advising them how to adjust their workflow, when they are constantly making mistakes.

What I consider the biggest failure of GitFlow is that it doesn't give people a clear vision of a versioning scheme.

Then what was all that nonsense the Author was saying about GitFlow recommending a master / dev branch, and making merges to the master branch releases. That sounds suspiciously like a clear versioning scheme to me.

1

u/gauiis Jun 20 '15

by rebasing the feature branches on the branch they're to merge with, then merging with --no-ff, which would result in a cleaner graph

I'm curious, do you have any more info on that? (article or some details)