Re: git rebase corrupts Xcode projects
Re: git rebase corrupts Xcode projects
- Subject: Re: git rebase corrupts Xcode projects
- From: Jens Alfke <email@hidden>
- Date: Fri, 28 Sep 2012 14:08:07 -0700
On Sep 28, 2012, at 11:54 AM, Doug Hill <email@hidden> wrote:
> Again, any help in figuring this out would be greatly appreciated. As of now, doing a rebase/merge corrupts my Xcode project files. Are Xcode projects not compatible with merge?
It depends on how you merge them :) I’ve had pretty good luck fixing up .pbxproj files after a merge conflict. In some cases where there have been major changes made, my attempts to merge don’t work. In that case what I usually do is tell Git to use one side or the other, then open the project in Xcode and redo whatever changes were made in the other branch.
—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