3 ms·

Related question: What's people's preferred diff tool for code and directories of code on macOS? I haven't found one I liked since the Catalina update killed 32

by HWR_14 5y ago

Related question: What's people's preferred diff tool for code and directories of code on macOS? I haven't found one I liked since the Catalina update killed 32-bit apps.

sgjohnson 5y ago
For me it’s the one that’s built into JetBrains IDEs. Although for directories I believe it only works when combined with Git. I’ve never tried to compare 2 directories of code in a situation that wasn’t a Git changeset.
joerobot 5y ago
I think Meld is a great tool. I haven't found another free tool that works as well. https://meldmerge.org/ https://meldmerge.org/
- deleted 5y ago
  [deleted]
eludwig 5y ago
I've used Beyond Compare for many years. Interface is not super polished, but it gets the job done for me. For both Mac & Windows (https://www.scootersoftware.com https://www.scootersoftware.com)
readbeard 5y ago
For git repositories in particular, I find Fork's [0] built-in diff tool to be pretty useful. [0] https://git-fork.com https://git-fork.com
sixstringtheory 5y ago
Kaleidoscope. File/directory diffing and three way merging, everything can be done with key combinations. Nice interface, can be invoked from command line.
- guessmyname 5y ago
  Here is a link for commodity: https://kaleidoscope.app https://kaleidoscope.app
  - mekster 5y ago
    This is probably the best on macOS but as the app is being bounced between different companies (probably 3rd now), now they charge some crazy $165 for the license. At least it's not subscription but feels a bit too much for a diff app.
grishka 5y ago
As I mostly work on Java projects, the one built into Idea/Android Studio is a good one for merge conflicts.
xenonite 5y ago
kdiff3 is my preferred tool, although homebrew doesn't offer M1 compiled binaries yet.
raju 5y ago
There was a discussion around Meld and other tools just yesterday here at HN: https://news.ycombinator.com/item?id=30741123 https://news.ycombinator.com/item?id=30741123
lelanthran 5y ago
I dunno about directories, I only use the diff from within `git difftool`, and to keep things simple I only use what I find in the default brew repo. Tkdiff: instant startup, stopped working on latest update so had to junk it. Was not thoroughly happy with it because it never remembered the monitor and position from instantiation to instantiation. Meld: Very slow startup. Takes 3s or so. Unusable from within `git difftool` due to the insane lag. Kdiff3: Fast startup, not as quick as Tkdiff, but around 200ms or so. Currently using it happily.

by HWR_14 5y ago

Related question: What's people's preferred diff tool for code and directories of code on macOS? I haven't found one I liked since the Catalina update killed 32-bit apps.

sgjohnson 5y ago

For me it’s the one that’s built into JetBrains IDEs. Although for directories I believe it only works when combined with Git. I’ve never tried to compare 2 directories of code in a situation that wasn’t a Git changeset.

joerobot 5y ago

I think Meld is a great tool. I haven't found another free tool that works as well. https://meldmerge.org/ https://meldmerge.org/

deleted 5y ago
[deleted]

eludwig 5y ago

I've used Beyond Compare for many years. Interface is not super polished, but it gets the job done for me. For both Mac & Windows (https://www.scootersoftware.com https://www.scootersoftware.com)

readbeard 5y ago

For git repositories in particular, I find Fork's [0] built-in diff tool to be pretty useful. [0] https://git-fork.com https://git-fork.com

sixstringtheory 5y ago

Kaleidoscope. File/directory diffing and three way merging, everything can be done with key combinations. Nice interface, can be invoked from command line.

guessmyname 5y ago
Here is a link for commodity: https://kaleidoscope.app https://kaleidoscope.app
- mekster 5y ago
  This is probably the best on macOS but as the app is being bounced between different companies (probably 3rd now), now they charge some crazy $165 for the license. At least it's not subscription but feels a bit too much for a diff app.

grishka 5y ago

As I mostly work on Java projects, the one built into Idea/Android Studio is a good one for merge conflicts.

xenonite 5y ago

kdiff3 is my preferred tool, although homebrew doesn't offer M1 compiled binaries yet.

raju 5y ago

There was a discussion around Meld and other tools just yesterday here at HN: https://news.ycombinator.com/item?id=30741123 https://news.ycombinator.com/item?id=30741123

lelanthran 5y ago

I dunno about directories, I only use the diff from within `git difftool`, and to keep things simple I only use what I find in the default brew repo. Tkdiff: instant startup, stopped working on latest update so had to junk it. Was not thoroughly happy with it because it never remembered the monitor and position from instantiation to instantiation. Meld: Very slow startup. Takes 3s or so. Unusable from within `git difftool` due to the insane lag. Kdiff3: Fast startup, not as quick as Tkdiff, but around 200ms or so. Currently using it happily.