Git-处理Xcode的project.pbxproj文件冲突问

2014-06-07 本文已影响1001人不是谢志伟

打开Xcode会显示:

Unable to Open Project

Project ... cannot be opened because the project file cannot be parsed.

打开冲突文件(xxxname.pbxproj)可以看到如下形式:

<<<<<<< .mine
    9ADAAC6A15DCEF6A0019ACA8 .... in Resources */,
=======
    52FD7F3D15DCEAEF009E9322 ... in Resources */,
>>>>>>> .r269

删除 <<<<<<< .mine,=======,>>>>>>> .r行,

9ADAAC6A15DCEF6A0019ACA8 /* BuyPriceBtn.png in Resources */,

    52FD7F3D15DCEAEF009E9322 /* discussionForm.zip in Resources */,

然后保存文件即可.