title: Merging Xcode project files
body: <p>There are often conflicts in the Xcode project file (Project.xcodeproj/project.pbxproj) when merging branches (I'm using git). Sometimes it's easy, but at times I end up with a corrupt project file and have to revert. In the worst case I have to fix up the project file manually in a second commit (which can be squashed with the previous) by dragging in files etc.</p>
  
  <p>Does anyone have tips for how to handle merge conflicts in big and complex files like the Xcode project file?</p>
  
  <hr>
  
  <p><strong>EDIT--</strong> Some related questions:</p>
  
  <p><a href="https://stackoverflow.com/questions/1549578/git-and-pbxproj">Git and pbxproj</a></p>
  
  <p><a href="https://stackoverflow.com/questions/2729109/should-i-merge-pbxproj-files-with-git-using-mergeunion">Should I merge .pbxproj files with git using merge=union?</a></p>
  
  <p><strong>RESOURCES:</strong></p>
  
  <p><a href="http://www.alphaworks.ibm.com/tech/xmldiffmerge" rel="noreferrer">http://www.alphaworks.ibm.com/tech/xmldiffmerge</a></p>
  
  <p><a href="http://www2.informatik.hu-berlin.de/~obecker/XSLT/#merge" rel="noreferrer">http://www2.informatik.hu-berlin.de/~obecker/XSLT/#merge</a></p>
  
  <p><a href="http://tdm.berlios.de/3dm/doc/thesis.pdf" rel="noreferrer">http://tdm.berlios.de/3dm/doc/thesis.pdf</a></p>
  
  <p><a href="http://www.cs.hut.fi/~ctl/3dm/" rel="noreferrer">http://www.cs.hut.fi/~ctl/3dm/</a></p>
  
  <p><a href="http://el4j.svn.sourceforge.net/viewvc/el4j/trunk/el4j/framework/modules/xml_merge/" rel="noreferrer">http://el4j.svn.sourceforge.net/viewvc/el4j/trunk/el4j/framework/modules/xml_merge/</a></p>