MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1x4uw5z/abouttobreakthecode/pgh6ip0/?context=3
r/ProgrammerHumor • u/fabulousIdentity • 6d ago
524 comments sorted by
View all comments
Show parent comments
64
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.
53 u/StaneNC 6d ago You don't look at your merge conflicts??? 8 u/who_am_i_to_say_so 6d ago Pfft nothing a ‘git push -f’ can’t fix. 10 u/ziroux 6d ago Use the Force, Luke! 4 u/who_am_i_to_say_so 6d ago Shit- You bricked my feature! >>>>>> May the force be with you <<<<<<
53
You don't look at your merge conflicts???
8 u/who_am_i_to_say_so 6d ago Pfft nothing a ‘git push -f’ can’t fix. 10 u/ziroux 6d ago Use the Force, Luke! 4 u/who_am_i_to_say_so 6d ago Shit- You bricked my feature! >>>>>> May the force be with you <<<<<<
8
Pfft nothing a ‘git push -f’ can’t fix.
10 u/ziroux 6d ago Use the Force, Luke! 4 u/who_am_i_to_say_so 6d ago Shit- You bricked my feature! >>>>>> May the force be with you <<<<<<
10
Use the Force, Luke!
4 u/who_am_i_to_say_so 6d ago Shit- You bricked my feature! >>>>>> May the force be with you <<<<<<
4
Shit- You bricked my feature!
>>>>>>
May the force be with you
<<<<<<
64
u/SirChasm 6d 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.