Visual Studio Code for Mac as diff/merge tool in Sourcetree

Question

Is there a way that I can set Visual Studio Code as the default diff/merge tool in Sourcetree on Mac?

Answer 1

You need to do below configuration in Sourcetree

• Go to Sourcetree → Preferences → Diff
• In the section External Diff / Merge, select Custom for the Visual Diff Tool and Merge Tool

• Diff Arguments → --diff --wait "$LOCAL" "$REMOTE"

• Merge Arguments → -n --wait "$MERGED"

• After configuration is saved, then goto the Sourcetree and right click on the file with merge conflicts Resolve Conflicts → Launch External Merge Tool

Note: Diff and Merge command should point to /usr/local/bin/code and not code otherwise it will not work

Answer 2

I 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)

/usr/local/bin/code