Re: Endless SCM Project File Conflict: project.pbxproj
Re: Endless SCM Project File Conflict: project.pbxproj
- Subject: Re: Endless SCM Project File Conflict: project.pbxproj
- From: Andrew Pontious <email@hidden>
- Date: Tue, 14 Jul 2009 00:12:08 -0700
On Jul 13, 2009, at 3:12 PM, Paul Summermatter wrote:
We've been having a lot of trouble with multiple users making
modifications to the project.pbxproj file and then folks having to
deal with merges. It seems like if any two users add a new file to
the project, one of them is going to end up in a conflict. I'm in
one of those situations right now, and I know that another user
added just one file, whereas I have a larger number of
modifications. So, I clicked on the option "Overwrite Repository
Changes". For some reason, PB just keeps popping up that confirm
over and over again. Every time I click, it goes away for a second
and then pops right back up. I've counted over 25 clicks now. Is
this a bug or a really useful feature for which I have no
appreciation :-)?
Sounds like a bug to me. Write it up with as many details as you can.
Also, how do people deal with these project file conflicts
generally? Other IDEs I have used will bring up a File Merge type
panel where you can resolve the conflict manually and then save.
Any suggestions or guidance would be much appreciated.
We don't have that currently. Unfortunately, you'll need to hand-merge
the changes yourself. If you're in 3.1, and you don't see a "Quit
Xcode" option in that panel you describe above, unfortunately your
only option may be to force-quit Xcode entirely. But once you do that,
you can go to the your Xcode project wrapper file, look inside its
package contents in the Finder, then open the project.pbxproj file
inside the wrapper in some other text editor such as BBEdit, and
search for your SCM system's conflict markers, such as <<<<<.
What you'll find is that you can remove those conflict markers, and
just leave all sets of files added by different users right on top of
each other, and save the project.pbxproj file, and it should work, as
long as the conflict is just that two different users both added
different files to the same Group.
Then, either from the command line or from inside the Xcode SCM
Results window, you'll have to tell your SCM system that the
project.pbxproj file has been resolved. (You need to use the SCM
Results window instead of normal Groups & Files because the SCM window
will allow you to see that inside-the-package project.pbxproj file.)
Hope that helps,
-- Andrew
_______________________________________________
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