Xcode's .pbxproj file parsing error after merging

Question

I merge one branch to another and when I run pod install, I get following error:

Nanaimo::Reader::ParseError - [!] Dictionary missing ';' after key-value pair for "objects", found ""
#  -------------------------------------------
#   rootObject = FC0C89D3193D83EB00EB8EA8 /* Project object */;
#  }
6905>  
   ^
#  -------------------------------------------

And also, my Xcode project is not opened showing No scheme. I cannot do something there. It seems I don't have references of some files after merging. Also, I don't have that files in Compile Sources. How can I solve this problem?

Answer 1

Sounds like you had a merge conflict.

The surest way of solving your problem is to revert YourProject.xcodeproj/YourProject.pbxproj to the last known-good version.

Once you've done that, you can add any missing files back using Xcode.

The Xcode project file is a horrible source of merge conflicts; it always pays to be very careful when merging or rebasing.