3 ms·

This doesn't seem like a good idea. What about features that take 10000+ lines of code? I'm guessing you ask your devs to split them across PRs. Is it really a

• delecti 5y ago
  We don't have features that take 10,000 lines of code. Our biggest features get split among a couple smaller PRs to review them along the way. I know there's a case for larger feature branches that accumulate an entire large feature before being merged into master, but in a world of microservices, it's just not a use case we've had to consider. And reverting PRs happens occasionally, but because changes are much smaller than the scale of what I assume you deal with, we never have many (if any) merge conflicts to deal with. We primarily deploy new features with feature flags, so it's vastly easier to just turn them off until we can fix the issue.
  • cellularmitosis 5y ago
    > I know there's a case for larger feature branches that accumulate an entire large feature before being merged into master, I think you are tempering your stance in the name of arguing charitably, but I’ll push against that. No, there is no case for this. Branches are pain accumulators. The longer they live, the more pain they will bring to everyone involved. If you need to work on something big, that’s what feature flags are for.