title: How to solve conflicts about project.pbxproj in Xcode use git?
body: <p>I always solved this problem by using directory structure of the other members shall prevail ,and then confirm don't have any conflicts and mend it to what directory structure I want.</p>
  
  <p>So, I want to know, the <code>project.pbxproj</code> file have conflicts, how to solve it through other best way? </p>