Automatically resolving git merge conflicts in Xcode’s project.pbxproj file

Instead of faithfully merging your Xcode Project files by hand, tell Git what to do with them.