Audio Convert、Merge & Split is a free program for Mac that belongs to the category Utilities-tools, and has been developed by Huafang liu. This program is available in English. Code Compare is a free compare tool designed to compare and merge differing files and folders. Code Compare integrates with all popular source control systems: TFS, SVN, Git, Mercurial, and Perforce. Just launch the FileMerge application, select your two files to compare (and merge, if you want to do that), and see how awesome it works. Of course, this is intended for more advanced comparisons and merging and aimed primarily at developers comparing code versions. I recommend vimdiff as best merge tool (vimdiff is a script bundled with vim. It opens vim with pre-defined windows layout). What is the best git merge tool for the Mac? Update Cancel. Merging is tedious. For example, every two weeks we have to merge code between two team's branch. There could be more than 100 conflicts.
Is there a way that I can set on Mac the Visual Studio Code as the default diff/merge tool in SourceTree?Thank you in advance.
ozzottoozzotto
2 Answers
According to the docs I found, SourceTree just uses whatever you've configured your git repo to use.
You can configure your git repo to use VS Code with the git config command like so:
However, you must configure VS Code to launch from the terminal before this will work.
See this blog for more info.
JDBJDBI found this with instructions on how to get it to work on the Mac. I wasn't able to get it to work until I used the full path to the code executable (I also set code in my global path)