News for hackers. Stuff that matters.
Re:GitFlow considered harmful by Bahamut on Friday June 19, 2015 @10:41AM (#9745057)
One thing that bothers me about GitFlow is that it mangles history with merges. Sometimes it becomes tricky to debug issues when history was created with GitFlow.

I would rather branch off of master, bring changes in via git am or rebasing when ready, then tag a release when it is ready to be released. If there is something wrong with master, the tagged releases serve as easy points to branch off of.

Re:GitFlow considered harmful by pacquiao882 on Friday June 19, 2015 @04:51PM (#9747603)
I think it depends on the project's structure and team discipline. I tend to prefer straight lines in the history where a single feature or a group of similar functions are linear.