• 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: "Glenn L. Austin" <email@hidden>
  • Date: Thu, 27 Sep 2012 18:17:48 -0700

On Sep 27, 2012, at 2:23 PM, Doug Hill <email@hidden> wrote:

> Hence, I generally hate doing rebases as they corrupt my projects.
>
> Maybe I'm doing something wrong. I have a couple of questions about this:
>
> 1. Is there a way to do this rebase/merge and keep the proper target associations?
> 2. If not, is there a way to search an Xcode project for files that have no target association so I can at least find out what file settings have been corrupted?


Dealing with conflicts in Xcode projects are interesting, but pretty straightforward.

You state that there's no change, but git doesn't show "no change" lines -- so something is different.

Using FileMerge is beneficial, but understanding that Xcode projects are XML-like with comments that mean something is crucial.

Any SCCS is going to have similar issues.

--
Glenn L. Austin, Computer Wizard and Race Car Driver         <><
<http://www.austin-soft.com>


 _______________________________________________
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

  • Follow-Ups:
    • Re: git rebase corrupts Xcode projects
      • From: Doug Hill <email@hidden>
References: 
 >git rebase corrupts Xcode projects (From: Doug Hill <email@hidden>)

  • Prev by Date: git rebase corrupts Xcode projects
  • Next by Date: Problem editing in Info tab
  • Previous by thread: git rebase corrupts Xcode projects
  • Next by thread: Re: git rebase corrupts Xcode projects
  • Index(es):
    • Date
    • Thread