title: Should I merge .pbxproj files with git using merge=union?
body: <p>I'm wondering whether the merge=union option in .gitattributes makes sense for .pbxproj files.</p>
  
  <p>The manpage states for this option:</p>
  
  <blockquote>
    <p>Run 3-way file level merge for text files, but take lines from both versions, instead of leaving conflict markers. This tends to leave the added lines in the resulting file in random order and the user should verify the result.</p>
  </blockquote>
  
  <p>Normally, this should be fine for the 90% case of adding files to the project. Does anybody have experience with this?</p>