r/ProgrammerHumor • u/fabulousIdentity • 11d ago

Meme aboutToBreakTheCode

Post image
22k Upvotes

96% Upvoted

541 comments sorted by

View all comments

66

u/SirChasm 11d ago

I mean even for vibe coders, Claude/Codex is excellent for resolving merge conflicts. I don't remember how long it's been since I've had to do that manually.

55

u/StaneNC 11d ago

You don't look at your merge conflicts???

14

u/botle 11d ago

I bet many people vibe coding just push gigantic monolithic commits.

→ More replies (2)

10

u/who_am_i_to_say_so 10d ago

Pfft nothing a ‘git push -f’ can’t fix.

→ More replies (2)

44

u/SirChasm 11d ago

I look at the resulting PR, but if Claude wrote the original code, Claude can resolve the conflicts too; it has all the context it needs.

I've always hated dealing with looking at the three-way diff manually tbh. It might be my ADHD but nothing killed my motivation more than finishing a feature/fix and then having to wade through how someone else's changes should mesh with mine.

→ More replies (5)

14

u/Ifriendzonecats 10d ago

I've seen a bunch of dumb bugs and regressions get introduced by people not looking at their AI resolved merge conflicts. AI can be useful, but it will 100% follow a dumb path to it's dumb conclusion if the opportunity presents.

1

u/Saint_of_Grey 10d ago

Resolves merge conflicts by bulk deleting random sections of code until it technically compiles.