本文介绍了如何使用opendiff作为默认的mergetool的处理方法,对大家解决问题具有一定的参考价值,需要的朋友们下面随着小编来一起学习吧!
问题描述
您好我正在尝试使用opendiff作为git mergetool,但是当我运行mergetool时,我收到以下错误消息:
我做错了什么?它工作正常之前,但因为我安装了一个新的硬盘驱动器不再工作了:(
)解决方案
您需要配置opendiff作为你的全局merge.tool:
#locate xcode utilities $ b $ sudo xcode-select -switch / Applications / Xcode .app / Contents / Developer
#将opendiff设置为全局缺省mergetool
git config --global merge.tool opendiff
如果您获得同意Xcode / iOS许可证需要管理员权限,请通过sudo以root身份重新运行
,打开XCode并接受许可证修复问题
Hi I am trying to use opendiff as the git mergetool, but when I run mergetool I get this error message:
What am I doing wrong? It was working fine before, but since I installed a new harddrive it's not working anymore :(
解决方案
You'll need to configure opendiff as your global merge.tool:
# locate xcode utilities
sudo xcode-select -switch /Applications/Xcode.app/Contents/Developer
# set "opendiff" as the default mergetool globally
git config --global merge.tool opendiff
If you get Agreeing to the Xcode/iOS license requires admin privileges, please re-run as root via sudo
, opening XCode and accepting the license fixes the issue
这篇关于如何使用opendiff作为默认的mergetool的文章就介绍到这了,希望我们推荐的答案对大家有所帮助,也希望大家多多支持!