3 ms·
I don't understand how any of the problems mentioned are related to git flow (or even to feature branches, which is what they're really complaining about) And
by anentropic 9y ago
I don't understand how any of the problems mentioned are related to git flow (or even to feature branches, which is what they're really complaining about)
And I don't see how they're any better off all committing to master
eg
> Merge problems become hairier and hairier. With everybody working on a long-lived branch, there will be multiple conflicts once they eventually merge. Large scale refactors are discouraged because they will “break everybody’s branches”.
How is that different if everyone commits to master? As soon soon as someone does a large-scale refactor you'll break everyone's "master" and have merge conflicts. It's no different.
Their real problem is not knowing how to manage a team of developers, making huge PRs etc etc
- Cthulhu_ 9y agoThe secret there is to not do large-scale refactors, but break them up into smaller units of work. The author also mentions that big changes happen behind feature flags, to enable parallel development.
- joshribakoff 9y agoFeature toggles work great most of the time. But it's kind of hard to put a feature toggle on a refactoring. Sometimes the new features involve refactoring shared code that was otherwise stable.