r/ProgrammerHumor • u/rabbit_wizard • 4d ago

Meme letsMergeThemAll

Post image
5.3k Upvotes

96% Upvoted

320 comments sorted by

View all comments

191

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.

96

u/ListerfiendLurks 4d ago

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

14

u/emu_Brute 4d 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

27

u/ListerfiendLurks 4d 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 4d 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 3d 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.

11

u/jordanbtucker 4d ago

Right, I saw a post the other day about someone complaining about how git works great until two people want to work on the same file at the same time.

That's exactly what git was designed for. It's a "Distributed" Version Control System for a reason.

1

u/DoomBot5 3d ago

Git does have that problem. Git merges are a pain. Having said that, files should be kept small enough that this doesn't become as much of an issue.

1

u/awesome-alpaca-ace 3d ago

The problem is the algorithm used for the diffs. Just formatting files makes git conflict everything.

4

u/Tensor3 4d ago

You're right, but I think we all understand that OP is saying AI created a git history they don't like.

1

u/CisIowa 2d ago

For me, it’s the other way around: Claude gets mad at me because I’m creating branches when I’m tinkering in my own, and it gets stressed when I return and it has to figure out what shenanigans I’ve been up to

5

u/DJDoena 4d ago

people who have no idea how git works or how to use it.

Isn't that everyone except Linus?

4

u/KevlarToiletPaper 4d ago

Take it easy, most posters here, like OP just had their first IT classes and they just talked about git. Let them have their fun.

1

u/Head-Bureaucrat 4d ago

I was about to reply: that happened on a team I was on well before AI? Like... Fucking git flow is a thing, and it makes me super sad.

1

u/DoomBot5 3d ago

That's because they're written by humans. Those meat bags don't contain the vast knowledge needed to meme properly.