Re: git rebase corrupts Xcode projects
Re: git rebase corrupts Xcode projects
- Subject: Re: git rebase corrupts Xcode projects
- From: Doug Hill <email@hidden>
- Date: Fri, 28 Sep 2012 11:54:18 -0700
Glenn,
Thanks for the response.
> Dealing with conflicts in Xcode projects are interesting, but pretty straightforward.
In my experience, this is anything but true. I find that doing merges are usually fraught with problems that I are not obvious why they happen. As I mentioned, when doing a 3-way merge of Xcode projects, picking lines from two different projects will sometimes result in corrupted projects. I'm trying to see if there's perhaps something I'm doing wrong but it's certainly not straightforward.
> You state that there's no change, but git doesn't show "no change" lines -- so something is different.
It's certainly not obvious what the difference is. In my merge program I go to the next conflict, but I only see a change in one of the files but not the other. Unless Araxis and FileMerge are broken, something definitely weird is going on.
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?
Thanks.
Doug Hill
Schematic Labs, Inc.
http://soundtracking.com/
On Sep 27, 2012, at 6:17 PM, Glenn L. Austin wrote:
> 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