Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I have a project that I am working on on two different Macs. I move the source around via an SVN server (the default one that comes with the Mac). Every single time I try to do an update, I get this error:
SCM Project File Conflict: MyProj.xcodeproj/brianpapa.pbxuser
Is there any way to avoid it? Each time I have to discard my local copy, and then let the project reload.
See the following thread of discussion. It is old though.
.pbxuser file stores user’s preferences for the project, e.g. window sizes, active build style, file bookmarks, and a few other things.
There is also a default.pbxuser (or something like that) that you could keep in the repository. Any new user opening the project will get those settings as a starting point for their personal .pbxuser file.
Based on this my suggestion would be to include the default preference file only. Else any one changing the user preference settings will result in changes to this file. I guess, it is some non-textual format for storing information and subversion is not able to resolve it.