I really like <a href="https://kaleidoscope.app" rel="nofollow">https://kaleidoscope.app</a><p>It has a new release and is the most Mac-like of the various diff tools I've used.
Beyond Compare is a pretty good diff/merge tool that runs natively on macOS. Sure it's UI is slightly non-native too.<p><a href="https://www.scootersoftware.com/" rel="nofollow">https://www.scootersoftware.com/</a>
One of the things I like in P4Merge is having 4 panes - the two versions, their common ancestor, and the final merge result. Can you get all these in Meld as well?
I was moved by the message on the last GH release for Meld macOS. So tragic and sad, and I will pray for your brother Youssef.<p><pre><code> Dedicated to Osama
If you use this software, please pray for my brother.
https://www.stuff.co.nz/national/christchurch-shooting/111375038/osama-abu-kwaik-was-a-refugee-born-to-an-orphan-who-died-in-christchurch-the-city-he-loved
</code></pre>
<a href="https://github.com/yousseb/meld/releases/tag/osx-19" rel="nofollow">https://github.com/yousseb/meld/releases/tag/osx-19</a>
I assumed this was a "more native" port of Meld to macOS, as it has been available for Mac for a while. I've been using the version installed via `brew`.<p>It appears this is the same version (the page says "Homebrew now installs Meld for OSX").<p>The macOS integration is a bit klunky (really feels like a non-native app), but this remains my preferred visual diff app. Thanks to those who make it and maintain the macOS port.
I used to use this until I discovered vim has a built in diffing mode - vimdiff. I’d still be using Meld if vim wasn’t already so much part of my workflow.
I get confused by diff GUIs but I have been using "git-delta" <a href="https://github.com/dandavison/delta" rel="nofollow">https://github.com/dandavison/delta</a> as a pager of git and it's been wonderful so far (just for the syntax highlighting in diff)<p>diffstatic is nice too and use it sparingly
Shout out to Emacs Ediff - it can compare files, directories, buffers (open files), regions within buffers (selected text within files, and is version control aware.
Sublime Merge (when it comes to git integration) is the best choice now - at least for me.<p>Meld, on the other hand, is the best tool for comparing local copies and directories.
I REALLY love the way merge tool works in IntelliJ IDEA.<p>Is there some other tool out there that works in a similar way, and that good?<p>(tho, typing idea . and doing a merge fix is not that bad)
Strange that no one mentioned Araxis merge<p><a href="https://www.araxis.com/merge/index.en" rel="nofollow">https://www.araxis.com/merge/index.en</a>
Just plugging difflens here: <a href="https://github.com/marketplace/difflens" rel="nofollow">https://github.com/marketplace/difflens</a><p>If you work primarily with frontend technologies and want a syntax aware diff on GitHub PRs, difflens might be right up your alley! Standalone Mac and Windows apps are coming out soon.
Honest question: I have been using emacs/vim for many years, and always just used the diff viewer shipped with them. Any reason to switch to these tools? Do they have some functionality not available in these old tools? I am, frankly, ignorant of what these tools provide.
Strange, I haven't used a merge tool in 2-3 years.<p>old job:
Changes staged locally for 2-3 weeks sometimes.
Team-specific branches, integrating into the mainline periodically.. eventually moved to several hundred devs committing to mainline.
One monster repo<p>Beyond Compare 2 was the only tool for the job simply for the ability to provide a manual hint (via spacebar) to align two version of the same file<p>current company:
never merge more than a line or two which I do with vim.
Change sets only last max 1 week on my machine.
We have 5-6 services (each in their own repo).
20 people committing amongst them all.<p>I do wish our code review tool was better though. Perhaps I will take one of the suggestions from this thread and build a custom CR work flow.
I found it a bit frustrating that merge tools I used were never able to solve trivial merge conflicts automatically. So I built something myself: <a href="https://fdietze.github.io/blend" rel="nofollow">https://fdietze.github.io/blend</a><p>On that page you can paste your merge conflict and copy the automatically merged result, along with some useful diffs. I hope it helps someone else. So far it solves around 80% of my conflicts automatically.
Meld is great. It has my favorite clean UI of any 3-way diff/merge tool, but the horrendous performance on Mac because of GTK3 makes it hard to use sometimes.
How does it compare to WinMerge? I haven't found a tool on any platform that beats it.<p>In fact, I use Wine on my Mac specifically so I can use WinMerge.
Meld is one of the first things I make sure I have on a new Linux install. Usually good apps come out for Mac only and the likes of me go all "wot, no Linux version?" but today I learned that until today, Mac users might have said that on Meld.
If you are going through all the trouble to make a nice macOS build, why wouldn't you notarize it?<p>I know that it's mostly security theather, but those scary warnings that Apple shows for software they haven't notarized must scare a lot of people away.
How do you evaluate diff tools, like this?<p>Is there some common repository of merge conflicts, which one can use to gauge how well a certain tool fares?
I use neovim as mergetool and some ad hoc diff tasks, but I'm glad to see meld on Mac. It is the tool I recommend when I see someone struggling with git rebase conflicts (and not using using vim).
Thank you for Meld for OSX, love it.<p>Always used meld on Ubuntu as well. I love how simple and clear it is.<p>Small UX/QOL improvement on OSX could be to remember the window's position and size between launches.
> If you want to donate, please donate to the original Meld project.<p>Anyone know how to actually do that? I've not been able to find a donation link on the Meld website.