Automatically resolving git merge conflicts in Xcode’s project.pbxproj fileIf you’re like me, you hate manually resolving merge conflicts in Xcode’s project.pbxproj file every time both you and one of your teammates add a new file to your project. It’s an “easy” merge in a sense – you always want to keep both sides – but somehow git can’t figure it out. Here’s how to make git merge those pesky *.pbxproj files for you – without you having to manually resolve conflicts eve
