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.
Comments
I remember enjoying https://meldmerge.org/ in the past for interactive visual file merging. It's apparently still being somewhat actively developed.
I really like the rubberband connections. They are like mental glue.
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.
I used to use Meld, now I use VS Code. Meld is still pretty great of you like standalone tools.
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.
kdiff3 deserves a mention IMHO
meld...also great to diff folders