Automatically resolving Git merge conflicts in Xcode's project.pbxproj | Hacker News Reader