Which merge tool do you use?

Question

I use VS Code or Github. I can't say I'm entirely happy. What do you use?

schoen · Accepted Answer

I remember enjoying https://meldmerge.org/ in the past for interactive visual file merging. It's apparently still being somewhat actively developed.

eternityforest · Answer

I used to use Meld, now I use VS Code. Meld is still pretty great of you like standalone tools.

reliefcrew · Answer

kdiff3 deserves a mention IMHO

pestatije · Answer

meld...also great to diff folders

threecheese · Answer

I purchased GitKraken, because they have a decent automated &ldquo;AI&rdquo; 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&rsquo;ve found the tool to be reliable.