these days, vscode does a fantastic job. you just use code --diff file1.js file2.js
meld will compare trees of folders. Does vsc?
Meld is a visual diff and merge tool targeted at developers
41–50 of 146 posts
Re: Meld is a visual diff and merge tool targeted at developers
#42IMHO, 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/
Do you think the pro version of BeyondCompare is worth it compared to the standard one?
Re: Meld is a visual diff and merge tool targeted at developers
#43Meld might be useful for comparison, but in my opinion it is inconvenient as a git merge tool. For git merge I need four panels: original file, version A, version B, merged result. Meld has only three panels.
Currently I am using KDiff3. It is a little buggy and doesn't have a nice UI but it is the best open source merging tool that I am aware of. It allows choosing lines from original file, from A, B and manual editing.
I noticed that certain popular and highly praised commercial IDE also provides only 3-panel interface for merging. This makes resolving conflicts more difficult and prone to errors.
Re: Meld is a visual diff and merge tool targeted at developers
#44Meld might be useful for comparison, but in my opinion it is inconvenient as a git merge tool. For git merge I need four panels: original file, version A, version B, merged result. Meld has only three panels. Currently I am using KDiff3. It is a little buggy and doesn't have a nice UI but it is the best open source merging tool that I am aware of. It allows choosing lines from original file, from A, B and manual edit…
I really wish kdiff3 would get a modern update.
Re: Meld is a visual diff and merge tool targeted at developers
#45Another fan of Beyond Compare here, but I want to point out something everyone else has missed so far, which is that BC is great for comparing all sorts of files, not just code.
For example, I use its "Table Compare" feature to compare log files from different machines, sorted by timestamp. This lets me easily see the order of operations in a distributed system.
Re: Meld is a visual diff and merge tool targeted at developers
#46IMHO, 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/
Do you think the pro version of BeyondCompare is worth it compared to the standard one?
You need the Pro version to do a 3-way merge.
Re: Meld is a visual diff and merge tool targeted at developers
#47Since everyone else is mentioning other tools, here’s my mention for vimdiff. I think I have meld installed but rarely use it because vimdiff is usually enough. As a bonus I get to use my usual editing keys when working with it.
Re: Meld is a visual diff and merge tool targeted at developers
#48BeyondCompare is much better and available on macOS too.
Adding another vote for BeyondCompare. It's not free, but it's fantastic.
Re: Meld is a visual diff and merge tool targeted at developers
#49My memories of meld from the past: slow, confusing, crashed. Havent touched it in 10 years since.
Re: Meld is a visual diff and merge tool targeted at developers
#50"Diffuse" has come to my rescue in the past when I've needed to do the odd 6-way diff (don't ask)