• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag
 

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: git rebase corrupts Xcode projects
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

References: 
 >git rebase corrupts Xcode projects (From: Doug Hill <email@hidden>)
 >Re: git rebase corrupts Xcode projects (From: "Glenn L. Austin" <email@hidden>)
 >Re: git rebase corrupts Xcode projects (From: Doug Hill <email@hidden>)

  • Prev by Date: Re: git rebase corrupts Xcode projects
  • Next by Date: Re: git rebase corrupts Xcode projects
  • Previous by thread: Re: git rebase corrupts Xcode projects
  • Next by thread: Re: git rebase corrupts Xcode projects
  • Index(es):
    • Date
    • Thread