Any recommended tools, which can do in-place (for in-place, I mean some IDE or tools which could have functions of both compare and merge.) compare for two files, and merge them in-place?
I currently use the diff command line, but am looking for a GUI tool.
Free tool is appreciated. :)
Here are some suggestions:
FileMerge (opendiff)
It's no longer bundled with Xcode Command Line Tools, you must install Xcode from either the App Store or the Apple Developer Website.
Open sourced beautifier and language aware code comparison tool for many languages.
Can be installed using Homebrew via command: brew install meld
Can be installed using Homebrew via command: brew install tkdiff
Available at App Store
Commercial with free trial.
Commercial with free trial.
No longer in Homebrew, it has not been developed/updated since 2014.
Related posts:
Meld is the best tool for Mac and Windows. Thanks
Commented
Jun 15, 2019 at 15:37
bbdiff --ignore-spaces "./path/to/file1.txt" "./path/to/file2.txt" Works in free mode too.
If you are already working with code then I recommend Visual Studio Code since it has an excellent built-in diff tool. Visual Studio Code is a pretty good code editor in its own right so I think it's a good app to have installed along with your other development tools. I use it to work on miscellaneous projects outside of my main IDE.
To use its compare feature, you first need two files open. Then, from the explorer panel, right click the first file and click "Select for Compare". Then, from the explorer panel, right click the second file and click "Compare with Selected". A new tab will open which shows the two files side by side with differences highlighted.
Here is an example of the difference view:
Conveniently, you can also launch the difference view from the command line. Based on the documentation, it looks like you can launch it like this:
code -d /path/to/file1 /path/to/file2
or
code --diff /path/to/file1 /path/to/file2
