Question

当我尝试使用git mergetool时，我收到以下错误。

Normal merge conflict for 'application/language/dutch/config_lang.php':
  {local}: modified file
  {remote}: modified file
Hit return to start merge resolution tool (opendiff): 
2014-10-16 16:30:02.996 FileMerge[42541:5140761] Failed to connect (delegate) outlet from (DiffController) to (DiffController): missing setter or instance variable
2014-10-16 16:30:02.997 FileMerge[42541:5140761] Failed to connect (mainPrefPane) outlet from (DiffController) to (NSBox): missing setter or instance variable
2014-10-16 16:30:03.071 FileMerge[42541:5140761] Unable to load platform at path /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
2014-10-16 16:30:03.072 FileMerge[42541:5140761] Unable to load platform at path /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform

我该怎么做才能解决这个问题？该工具启动但我无法在第一个文件后继续。

注意：此错误是间歇性的，但大部分时间都会发生。

Answer 1

cd /Applications/Xcode.app/Contents/Developer/Platforms

plutil -convert xml1 iPhoneOS.platform/Info.plist

plutil -convert xml1 iPhoneSimulator.platform/Info.plist

这修复了第二组警告。这是自10.8以来的一个问题，但苹果忽略了我的错误报告：）

Answer 2

从10.9升级后，我看到了相同的行为。根据{{3}}回答，删除iPhoneOS.platform和iPhoneSimulator.platform。如果需要，可以从XCode中正确地重新安装它们。前者为我工作。

Mac OS X 10.10合并工具git bug

2 个答案: