解决 pbxproj 合并冲突 A Better Way to Automatically Merge Changes in Your XCode Project Files brew install mergepbx git mergetool --tool=mergepbx PROJECT.pbxproj