Ask HN: Which merge tool do you use?

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

5 comments of 7

[ 304 ms ] story [ 1570 ms ] thread

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

eternityforest 9mo ago ↗

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

reliefcrew 9mo ago ↗

kdiff3 deserves a mention IMHO

pestatije 9mo ago ↗

meld...also great to diff folders

threecheese 9mo 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.