Skip to content

Instantly share code, notes, and snippets.

@anhar

anhar/sourcetree_filemerge_not_working.md

Created March 12, 2022 17:01
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save anhar/dbffa32ae64ef2d4168350953cc6f928 to your computer and use it in GitHub Desktop.
Save anhar/dbffa32ae64ef2d4168350953cc6f928 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
sourcetree_filemerge_not_working.md

SourceTree & FileMerge not working

If you are experiencing issues on OSX where FileMerge doesn't open when you:

  • Right click on a file with conflicts
  • Select "Resolve Conflicts"
  • Select "Launch External Merge Tool"

Follow these steps to make sure you have everything setup correctly.

Run this command in your terminal to point to your Xcode installation:

sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer

Update your git config to indicate that you want to use opendiff as your mergetool globally:

git config --global merge.tool opendiff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment