title: How to merge conflicts (file project.pbxproj) in Xcode use svn?
body: <p>There are two members in our team. We use Xcode's SCM (use SVN) to manger our source code files.<br>
  We all add files to our Xcode project. He has committed to SVN server. When I update, Xcode find there has conflicts in <code>project.pbxproj</code> file. Then I select quit <code>Xcode</code> and manually merge the conflicts. Then I  start to edit my <code>project.pbxproj</code>, merge our changes. Actually I don't know how Xcode manage files, I just add some text that my <code>project.pbxproj</code> file did't have. When I finish, my project can't open. I guess that because the <code>project.pbxproj</code> file can't be edit by manual.</p>
  
  <p>So, I want to know, when you find this problem, the project.pbxproj file have conflicts, how to solve it?</p>
  
  <p>Thank you! </p>