5 ms·
IMHO, Meld is the second best open source tool for doing this. On Windows, WinMerge[1] is a better alternative. Too bad is Windows only. For a non-FOSS and cr
by diego_moita 5y ago
IMHO, Meld is the second best open source tool for doing this.
On Windows, WinMerge[1] is a better alternative. Too bad is Windows only.
For a non-FOSS and cross platform solution I recommend BeyondCompare (U$30.00)[2]. It replicates most of WinMerge UI.
[1] https://winmerge.org/ https://winmerge.org/
[2] https://scootersoftware.com/ https://scootersoftware.com/
- bmitc 5y agoI setup Git to use Perforce’s P4Merge as the Git mergetool. P4Merge is cross-platform and free and quite good.
- diego_moita 5y agoThere are 2 things to consider when comparing them: 2 panel diffs and 3 panel merging. P4Merge is very good at the second but not so much at the first. Also, to this date it doesn't have an OS-X version for M1 CPUs.
- crispyalmond 5y agoDo you think the pro version of BeyondCompare is worth it compared to the standard one?
- BeetleB 5y agoYou need the Pro version to do a 3-way merge.
- rubyist5eva 5y agoYes, I bought it years ago and it's been one of my goto tools. Worth every penny, plenty of features beyond just being a git mergetool.
- diego_moita 5y agoDepends... Pro version gives you 3 panel merging. If you use that a lot then it might be worth it. Or, instead, use P4Merge for it.
- memsom 5y agoYes. They often have sales, and I picked up Pro for about the price of Standard a few years back. If you see a sale, get Pro. If you are not worried about the pro feature set, get standard. The other thing is that the trial used to be very fair. I don’t know if they changed it, but it used to give you “days of usage” not contiguous days. I once used it for about 5 months because the 30 day trial only counted the days I actually used it and I saved using it for when I really needed it, and used WinMerge when I could instead. Beyond Compare is a gem.
- dataflow 5y agoI actually don't understand what people love about BC. The only thing I find it extremely useful for is the occasional files where inline diffs are practically mandatory, like CSVs. Other than that, I generally find it frustrating compared to TortoiseGitMerge, except perhaps for some very specific/unusual scenarios. In particular the line highlighting is annoying - instead of coloring the lines that were added vs. removed differently, it colors lines according to whether they're an "important difference" or "unimportant difference" (?!), which is borderline useless to me. What do people love about it so much?
- olvy0 5y ago+1 for TortoiseGitMerge, which is my go-to tool these days. It's Windows only but not a problem for me since I mostly work in Windows. My SO adores Meld, but she works with Linux. I tried using it but couldn't get used to it. She also makes fun of me (half in jest) because I use Tortoise Git instead of the command line...
- tigerlily 5y agoI use TortoiseGit too, ever since I used TortoiseSVN back in the day. Highly underrated, and ridiculously powerful, I’ve practically never had to look up “how to do x” :)
- larschdk 5y agoThe things that makes it borderline useless to you is actually one reason I like it so much. Makes it really easy to do code reviews and focus on what actually matters. Also, it was until somewhat recently the undisputed best 3-way merge tool. Meld gets close, but to me Meld's UI is sluggish and fuzzy (on Windows) while BC is snappy and sharp.
- dataflow 5y agoMaybe I need to try Meld at some point. Have you tried TortoiseGitDiff by any chance?
- memsom 5y ago
- zem 5y agowinmerge is definitely the best windows-only open source app I've used. surprised it's never been ported to linux.
- Shorn 5y agoWinMerge for comparing two individual files. BeyondCompare for comparing deep nested directory structures.