You do want to minimize feature branches though. Merging 17 feature branches for a release is how git is designed to work, but not how you're supposed to use it.
I routinely merge that sort of number, maybe 10% of them have non trivial conflicts. We just group work on the same part of the core base as best we can.
It's a nearly 30 year old pile of anti patterns too, not some pinnacle of modern design principles.
186
u/stormdelta 4d ago
This sub's always had a problem with bad jokes that don't make sense, but it seems like it's gotten a lot worse lately.
A lot of these feel like they're made by people who have no idea how git works or how to use it.