Ask HN: Which merge tool do you use?

#1

Post by axismundi » Thu, Dec 04, 2025, 2:30 AM UTC

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

Re: Ask HN: Which merge tool do you use?

#2

Post by schoen » Thu, Dec 04, 2025, 2:53 AM UTC

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

Re: Ask HN: Which merge tool do you use?

#3

Post by axismundi » Thu, Dec 04, 2025, 3:30 AM UTC

schoen wrote: post #2

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.

Re: Ask HN: Which merge tool do you use?

#4

Post by eternityforest » Thu, Dec 04, 2025, 3:31 AM UTC

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

Re: Ask HN: Which merge tool do you use?

#5

Post by axismundi » Thu, Dec 04, 2025, 4:04 AM UTC

eternityforest wrote: post #4

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.

Re: Ask HN: Which merge tool do you use?

#6

Post by reliefcrew » Thu, Dec 04, 2025, 4:18 AM UTC

kdiff3 deserves a mention IMHO

Re: Ask HN: Which merge tool do you use?

#7

Post by pestatije » Thu, Dec 04, 2025, 7:38 AM UTC

meld...also great to diff folders

Re: Ask HN: Which merge tool do you use?

#8

Post by threecheese » Thu, Dec 04, 2025, 4:55 PM UTC

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.