Re: project.pbxproj and Subversion
Re: project.pbxproj and Subversion
- Subject: Re: project.pbxproj and Subversion
- From: Paul Walmsley <email@hidden>
- Date: Fri, 26 Oct 2007 09:21:57 +0100
It it's text, and a three-way merge doesn't succeed, you're left with
auxiliary files showing the three versions, and project.pbxproj gets
marked up with conflict markers. The project file is definitely
unusable, and there's no sure or convenient way to edit it back into
shape.
Surely this is a problem that will be common to all SCM systems? In
general, with project files that have had substantial changes made on
different branches, this will result in merge conflicts. I think the
best way of resolving the problems is to start out with the version in
the branch that has had the most substantial changes made to it, and
then do a diff between the branch point and the other branch to see what
other things you need to do. Most of the time this will be a matter of
adding files to the project. Then just make those changes to the
project manually.
In summary: you have branch A and branch B, with a common ancestor
version C. You are merging A into B. If the project file has conflicts
then do a diff between C & A and B & A to see which has the most major
change. If A has changed the most then revert to this version and then
try to do the C->B changes by hand by adding files to the project,
changing project settings.
Treat-as-text is good, but has limitations. Treat-as-binary for project
files will just annoy the hell out of you.
Paul
_______________________________________________
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