3 ms·Automatically resolving Git merge conflicts in Xcode's project.pbxproj1 points by jtbrown 11y ago