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

If you’re like me, you hate manually resolving merge conflicts in Xcode’s project.pbxproj file every time both you and one … Continue reading Automatically resolving git merge conflicts in Xcode’s project.pbxproj file