FileMerge quits immediately after launching from SourceTree

前端 未结 5 1576
清酒与你
清酒与你 2021-01-31 07:57

I regularly use Atlassian SourceTree (on Mac OS X) to launch FileMerge to resolve git merge conflicts. Out of the blue it has stopped working: when I right click and select

5条回答
  •  臣服心动
    2021-01-31 08:10

    This also works to resolve the message "xcode-select: error: tool 'opendiff' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance":

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

提交回复
热议问题