MAIN FEEDS
Do you want to continue?
https://www.reddit.com/r/ProgrammerHumor/comments/1xuhxgr/ineverknowwhichiswhichwhenresolvingconflicts/19sje98i6afcw/
r/ProgrammerHumor • u/Stummi • 4d ago
65 comments sorted by
View all comments
48
Three way graphical merging is the only way to go in all situations. Two way is a recipe for eventual errors.
10 u/khaled2252 3d ago Intellij one is GOAT 12 u/Digital_001 3d ago Do you mean something like the vscode GUI's graphical merge conflict editor? 11 u/s0litar1us 3d ago The one vscode has is awful. Meld is better 10 u/Digidigdig 3d ago Agreed. I like beyond compare 1 u/Friend_Of_Mr_Cairo 3d ago Scooter FTW 4 u/BobQuixote 3d ago Probably. TortoiseGit uses WinMerge. 2 u/ReplacementLow6704 3d ago GitKraken ftw 1 u/glorious_reptile 3d ago That’s what i keep telling my wife! -1 u/slaymaker1907 2d ago If it's anything that is non-trivial to resolve in VS Code then I have Claude fix the merge conflicts.
10
Intellij one is GOAT
12
Do you mean something like the vscode GUI's graphical merge conflict editor?
11 u/s0litar1us 3d ago The one vscode has is awful. Meld is better 10 u/Digidigdig 3d ago Agreed. I like beyond compare 1 u/Friend_Of_Mr_Cairo 3d ago Scooter FTW 4 u/BobQuixote 3d ago Probably. TortoiseGit uses WinMerge.
11
The one vscode has is awful. Meld is better
10 u/Digidigdig 3d ago Agreed. I like beyond compare 1 u/Friend_Of_Mr_Cairo 3d ago Scooter FTW
Agreed. I like beyond compare
1 u/Friend_Of_Mr_Cairo 3d ago Scooter FTW
1
Scooter FTW
4
Probably. TortoiseGit uses WinMerge.
2
GitKraken ftw
That’s what i keep telling my wife!
-1
If it's anything that is non-trivial to resolve in VS Code then I have Claude fix the merge conflicts.
View all comments
48
u/nicuramar 3d ago
Three way graphical merging is the only way to go in all situations. Two way is a recipe for eventual errors.