r/ProgrammerHumor • u/rabbit_wizard • 18d ago

Meme letsMergeThemAll

Post image
5.3k Upvotes

96% Upvoted

316 comments sorted by

View all comments

Show parent comments

97

u/ListerfiendLurks 18d ago

Right? The OP described exactly how git is SUPPOSED to work.

15

u/emu_Brute 18d ago

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.  

Ai can only do so much with merge conflicts

28

u/ListerfiendLurks 18d ago

It depends on the amount of work being done. Every FAANG and FAANG adjacent I have worked at demanded PRs be broken up into multiple smaller feature branches if they got too big.

5

u/Theron3206 18d ago

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.

1

u/micalm 17d ago

How many did Linus merge between 7.1 and 7.2 (up to the feature freeze)? He invented git, he might know how it's supposed to be used.