81–90 of 146 posts
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/ [2] https://scootersoftware.com/
It’s slightly tricky to integrate into Sourcetree but once you configure Sourcetree with the correct command line args it works quite painlessly.
Meld is extremely performant too.
Another text editor I love is “010 Editor”, it’s the only windows app I’ve found that works well on 2+ GB files without slowing my computer down.
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/ [2] https://scootersoftware.com/
I 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. re…
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...
Maybe strange question; but which diff and merge tools are not targeted at developers? Edit: what->which
Wikipedia, Google Docs, Microsoft Word... they're far simpler systems, but still useful for everyday edits
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/ [2] https://scootersoftware.com/
I 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. re…
Kaleidoscope on macOS isn’t cheap but has a great DX.
Earlier quoted context omitted.
Wikipedia, Google Docs, Microsoft Word... they're far simpler systems, but still useful for everyday edits
These have some diff functionality but are not "diff / merge tools". There are diff tools, though, targeted at lawyers for legal work: "show me the differences between these two contracts" and the such (which most developer-oriented tools actually suck at as they care too much about "lines" and whitespace).
I've never used a lawyer's diff tool, but my IDE (IntelliJ) ignores whitespace and lines.