Endless SCM Project File Conflict: project.pbxproj
Endless SCM Project File Conflict: project.pbxproj
- Subject: Endless SCM Project File Conflict: project.pbxproj
- From: Paul Summermatter <email@hidden>
- Date: Mon, 13 Jul 2009 18:12:40 -0400
Folks,
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 :-)?
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.
Regards,
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