Ask HN: What's your favorite diff merge tool on macOS?

6 pointsby wassimdotis10년 전7 comments

I was going to buy a Kaleidoscope licence but then discovered that the last release was from June 2015 and that the software is no longer maintained.

I'm looking for good alternatives, any suggestions?

7 comments

dontJudge10년 전

> last release was from June 2015 ... no longer maintained

Dude. I'm using software that hasn't been maintained since 1983. You're worried about 2015?

hood_syntax10년 전

Software from 1983 that's still around probably has less issues than the average unmaintained project from today, if only because of survivorship bias.

johncoltrane10년 전

I've been using FileMerge "forever". It comes bundled with XCode and can be used in git as "opendiff".

drakenot10년 전

I've used the same. One thing that is odd is the "merge" window that shows the final result of the merge that sits below the left and right pane is set to 0 height by default. I've surprised several colleagues by moving my mouse to their bottom pane of FileMerge and dragging up showing them that 3rd pane.

thijsvandien10년 전

Just in case anyone involved reads this: I hate how Black Pixel bought Kaleidoscope just to let it rot.

avoidwork10년 전

I've been using Kaleidoscope for years... I don't know what feature you could want, maybe audio support? Handles my dev needs already.

philbo10년 전

Happy user of SourceGear DiffMerge here. It's probably not the most beautiful piece of software on the planet, but it gets the job done.