Can not open merge tool

[YunshuaiPeng]

Click the button, nothing happened.

gitup version: Version 1.3.2 (1045) file merge version: Version 2.11 (21012) macos version: macos Monterey 12.5.1 Apple M1

[matv13v]

Hi! As far as I know, you should to have a third-party tool for that kind of thing.

[lucasderraugh]

@pys1992 Are your external diff and external merge set to FileMerge?

[YunshuaiPeng]

@pys1992 Are your external diff and external merge set to FileMerge?

Of caurse. I haven't changed the settings.

[YunshuaiPeng]

[lucasderraugh]

@pys1992 What is your output if you run /usr/bin/opendiff in Terminal?

[YunshuaiPeng]

 /usr/bin/opendiff                                                                                                ✘ 255 deploy ✭
xcode-select: error: tool 'opendiff' requires Xcode, but active developer directory '/Library/Developer/CommandLineTools' is a command line tools instance

[lucasderraugh]

@pys1992 Please follow the steps to fix your Command Line tools instance. https://stackoverflow.com/questions/41116584/error-xcode-select-error-tool-xcodebuild-requires-xcode

You can do this either through Xcode, or xcode-select command line tool.

[YunshuaiPeng]

Thanks. I fix the issue by this answer. https://stackoverflow.com/a/17980786

[lucasderraugh]

Great! We throw alerts around most of these things, but we currently aren't doing anything when the task is run. It would be ideal if we could capture failure and present the output to the user so they can perhaps avoid debugging like we did here 😅.