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.
When A and B change the project’s structure at the same time,the project.pbxproj will conclict in git/svn. this file can’t be treated as text file, how could I solve this conflict?
Now, I have to override one’s project.pbxproj and manually apply another’s structure.
Any sugguest? thx
It can be treated as a text file. It’s ugly, but you can usually figure out what the various lines of text in there are doing, and merge with some elbow grease.