Xavier Chia xavierchia
xavierchia
/ gist:b7b983ca0f8f1270165d9242f21d034b
Last active
March 1, 2023 01:53
— forked from kylefox/gist:4512777
If you want to use Xcode's FileMerge as your git mergetool, this is how you set it up.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Tell system when Xcode utilities live: | |
| sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer | |
| # Set "opendiff" as the default mergetool globally: | |
| git config --global merge.tool opendiff | |
| # Then, when git tells you that there is a conflict, you can run `git mergetool` and | |
| # it will open XCode's mergetool (like in the question's screenshot) and you can work through the conflict. | |