I am trying to merge master into my feature branch, and presented with this error. I have looked around the internet, and also tried to debug this issue myself including playing around with the .pbxproj file's conflicts (which showed none). All paths I have taken has not been fruitful. I am kindly asking for any direction I should take (i.e. which files to look at). Thank you in advance.
If you're using git to merge branches, this can happen when there are conflicts that aren't properly resolved. Open the .pbxproj and delete any conflict markers:
<<<<<<<
=======
>>>>>>>
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With