Re: What to do when git munches your project file. Xcode 6.3.2
Re: What to do when git munches your project file. Xcode 6.3.2
- Subject: Re: What to do when git munches your project file. Xcode 6.3.2
- From: Jens Alfke <email@hidden>
- Date: Fri, 07 Aug 2015 15:58:08 -0700
On Aug 7, 2015, at 1:30 PM, Alex Zavatone < email@hidden> wrote:
Was just trying to push and pull from the remote repo and restarted Xcode.
Now Xcode can not parse the project file.
Sounds like there were conflicts, and git put conflict markers in the .pbxproj file. You’ll need to open it with some text editor and resolve the conflicts. Or else reset it to one side or the other of the merge, then apply the changes from the other branch manually.
—Jens |
_______________________________________________
Do not post admin requests to the list. They will be ignored.
Xcode-users mailing list (email@hidden)
Help/Unsubscribe/Update your Subscription:
This email sent to email@hidden