by niedzielski on 5/16/22, 7:25 PM with 149 comments
by selykg on 5/16/22, 8:27 PM
It has a new release and is the most Mac-like of the various diff tools I've used.
by jamesfmilne on 5/16/22, 8:00 PM
by m12k on 5/16/22, 7:58 PM
by tmslnz on 5/17/22, 9:41 AM
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
https://github.com/yousseb/meld/releases/tag/osx-19by sgarrity on 5/16/22, 7:55 PM
It appears this is the same version (the page says "Homebrew now installs Meld for OSX").
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.
by roydivision on 5/16/22, 8:07 PM
by ossusermivami on 5/17/22, 5:29 AM
diffstatic is nice too and use it sparingly
by jacobsenscott on 5/16/22, 10:20 PM
by kelahcim on 5/16/22, 10:00 PM
Meld, on the other hand, is the best tool for comparing local copies and directories.
by kodisha on 5/16/22, 9:47 PM
Is there some other tool out there that works in a similar way, and that good?
(tho, typing idea . and doing a merge fix is not that bad)
by piskov on 5/17/22, 1:50 AM
by difflens on 5/16/22, 10:39 PM
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.
by gtest on 5/17/22, 3:44 AM
by wnolens on 5/16/22, 11:06 PM
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
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
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.
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.
by manx on 5/20/22, 1:23 AM
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.
by SeanLuke on 5/16/22, 8:29 PM
by BugsJustFindMe on 5/16/22, 7:52 PM
by WalterGR on 5/16/22, 7:40 PM
In fact, I use Wine on my Mac specifically so I can use WinMerge.
by harel on 5/17/22, 9:32 AM
by newaccount74 on 5/16/22, 8:29 PM
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.
by onetom on 5/17/22, 3:19 AM
Is there some common repository of merge conflicts, which one can use to gauge how well a certain tool fares?
by butterguns on 5/16/22, 7:59 PM
by dummy_physicist on 5/16/22, 10:26 PM
by AltruisticGapHN on 5/17/22, 9:37 AM
Always used meld on Ubuntu as well. I love how simple and clear it is.
Small UX/QOL improvement on OSX could be to remember the window's position and size between launches.
by cibyr on 5/16/22, 8:27 PM
Anyone know how to actually do that? I've not been able to find a donation link on the Meld website.
by ahwvd37js on 5/17/22, 12:07 AM
by chris_wot on 5/17/22, 2:05 AM
by destitude on 5/16/22, 9:54 PM
by ppljudge on 5/17/22, 2:08 AM
by ruined on 5/16/22, 7:52 PM
by smoldesu on 5/16/22, 7:32 PM
by ibioes on 5/16/22, 10:18 PM
by mlatu on 5/17/22, 6:44 AM
by beepbooptheory on 5/16/22, 11:15 PM