I use VS Code or Github.
I can't say I'm entirely happy.
What do you use?
Comments
schoen•2mo ago
I remember enjoying https://meldmerge.org/ in the past for interactive visual file merging. It's apparently still being somewhat actively developed.
axismundi•2mo ago
I really like the rubberband connections. They are like mental glue.
eternityforest•2mo ago
I used to use Meld, now I use VS Code. Meld is still pretty great of you like standalone tools.
axismundi•2mo ago
I value simplicity and stability over bells and whistles. Meld looks simple. I mostly use macos and they seem to have good approach to support it.
reliefcrew•2mo ago
kdiff3 deserves a mention IMHO
pestatije•2mo ago
meld...also great to diff folders
threecheese•2mo ago
I purchased GitKraken, because they have a decent automated “AI” merge conflict resolution tool.
My use case is resolving conflicts from multiple parallel coding agent sessions, and because none of them are doing rocket surgery I’ve found the tool to be reliable.
schoen•2mo ago
axismundi•2mo ago