15

When I am attempting to use git mergetool I get the following errors.

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

What can I do to fix this? The tool launches but I cannot continue after the first file.

NOTE: This error is intermittent, but happens most of the time.

Chris Muench
  • 17,444
  • 70
  • 209
  • 362
  • Have you tried different mergetools? – kaman Oct 28 '14 at 09:54
  • I have this same issue after upgrading to OS X El Capitan and XCode 7.0 and 7.1. I'm using opendiff as part of the Mercurial brew package. I have not found a fix for the "Failed to connect" messages. – Jason R. Coombs Oct 29 '15 at 13:38

2 Answers2

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

plutil -convert xml1 iPhoneOS.platform/Info.plist

plutil -convert xml1 iPhoneSimulator.platform/Info.plist

This fixes the 2nd set of warnings. This has been an issue since 10.8, but apple ignores my bug report :)

cbalos
  • 879
  • 1
  • 9
  • 19
user3761183
  • 241
  • 3
  • 3
  • 2
    With the latest XCode release, I found I also had to run plutil on AppleTVOS, AppleTVSimulator, WatchOS, and WatchSimulator plist files. – Jason R. Coombs Oct 29 '15 at 13:18
  • 1
    `cd /Applications/Xcode.app/Contents/Developer/Platforms; for w in {iPhoneOS,iPhoneSimulator,AppleTVOS,AppleTVSimulator,WatchOS,WatchSimulator}; do sudo plutil -convert xml1 $w.platform/Info.plist ; done` – Giacomo Lacava Apr 20 '16 at 13:19
3

I see the same behavior after upgrading from 10.9. According to this answer, delete both iPhoneOS.platform and iPhoneSimulator.platform. Or reinstall them properly from XCode if you need them. The former worked for me.

Community
  • 1
  • 1
Lingnik
  • 144
  • 7