[andymoe]

Nice, however there is a much simpler solution that works for 99% of cases. [1]

Add a .gitattributes file to the root of your project with the following line:

*.pbxproj binary merge=union

Very occasionally you will get duplicate items but Xcode then warns you can take approbate action.

[1] I started using this approach a couple years ago after finding this:

http://stackoverflow.com/questions/12909222/tell-git-to-trea...

[seganw]

I did not use this before, but how Git would treat if people commit in the same files(PBXFileReference) but with different UUIDs?

xUnique makes these UUIDS unique for everyone in the project. So there should be no conflicts theoretically.

[andymoe]

Like I said, there are edge cases but I've been using this with teams for a few years and I hardly ever have to fix the project file.