swift - Xcode Not Opening Project After Git Merge -
i merged 2 branches , resolved close 100 conflicts. now, xcode doesn't allow me open of projects project navigator. way edit conflicted files in first place click on conflicts issue navigator.
i'm not sure if it's important, vast majority of conflicts occcured in .pbxproj file , accepted both versions in cases. additionally, pods project disappeared. when running pod install
, got following error:
any appreciated, thanks!
sometimes, accepting both sides of merge create duplicate sections in xcode project. or worse, invalid sections.
xcode projects in old ascii plist format. can see file vaguely json or yaml file, basic tree structure. possible basic structure can corrupted if accept both sides of merge without paying attention contents of merge. make sure parentheses ()
, braces {}
balanced correctly after merge.
another problem objects represented in new property list might not make sense xcode. i'm not sure of requirements of file structure since isn't well-documented, when i've generated xcode projects scripts, xcode has been picky generate file right.
you can try merge again , focus more on structure of xcode project, or can pick 1 branch merge , manually make other branch's changes xcode project within xcode.
Comments
Post a Comment