Ask HN: Which merge tool do you use?

2 pointsaxismundi3mo ago7 comments

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

7 comments

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

axismundiOP3mo ago

I really like the rubberband connections. They are like mental glue.

threecheese3mo 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.

eternityforest3mo ago

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

axismundiOP3mo 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.

reliefcrew3mo ago

kdiff3 deserves a mention IMHO

pestatije3mo ago

meld...also great to diff folders

j / k navigate · click thread line to collapse

7 comments

schoen3mo ago

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

axismundiOP3mo ago

I really like the rubberband connections. They are like mental glue.

threecheese3mo 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.

eternityforest3mo ago

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

axismundiOP3mo 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.

reliefcrew3mo ago

kdiff3 deserves a mention IMHO

pestatije3mo ago

meld...also great to diff folders

j / k navigate · click thread line to collapse