Re: git rebase corrupts Xcode projects
Re: git rebase corrupts Xcode projects
- Subject: Re: git rebase corrupts Xcode projects
- From: Marco S Hyman <email@hidden>
- Date: Fri, 28 Sep 2012 12:47:05 -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?
Possibly. If a fileRef changed in the .pbxproj on one branch and group
that referenced the original fileRef moved in another branch I think the
results of a rebase or merge can be both conflict free and incorrect.
Most of the time I have no issues using rebase or merge.
Marc
_______________________________________________
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