[jreposa]

My biggest issue is merging the project.pbxproj file every time someone on my team commits. Merging never works and we have to manually edit the XML.

It's an awful feeling to always be afraid to change anything in the project outside of the source code. Did you both add a new file? Too bad; conflict!

[thevectorist]

I had this same problem too. With my team, whenever someone needs to edit the project file, we shout it out. 'Changing project file!'. They make their changes and push. Everyone then pulls the new file and go on their merry way. It's a bit of a pain, but it works and we rarely have conflicts now.