提示错误一：同步冲突，
<<<<<<< .mine
9ADAAC6A15DCEF6A0019ACA8 .... in Resources */,
=======
52FD7F3D15DCEAEF009E9322 ... in Resources */,
>>>>>>> .r269 解决方法：
1.对.xcodeproj 文件右键，显示包内容
2.双击打开 project.pbxproj 文件
3.找到以上类似的冲突信息（可以用commad + f 搜索）
4.删除 <<<<<<<,======,>>>>>>这些行
5.保存，退出
6.重新打开.xcodeproj文件即可
提示错误二：
在打开Main.StoryBoard提示错误中的提示错误入下：
The document "Main.storyboard" could not be opened. Multiple elements have the IDs "6T4-Lv-0U2", "6Zx-Su-c9v", "Jxt-Xv-d2k", "O2Z-C1-IOs", "Pig-Dv-saV", "dIp-Np-zE9", "gDF-oD-lNL", "rgg-bY-5Wu", "tc5-8c-Qp8", "uPe-GF-gNd", and "vsq-Cc-fxu"这是因为Main.storyboard里面的ID为”6T4-Lv-0U2”, “6Zx-Su-c9v”, “Jxt-Xv-d2k”, “O2Z-C1-IOs”, “Pig-Dv-saV”, “dIp-Np-zE9”, “gDF-oD-lNL”, “rgg-bY-5Wu”, “tc5-8c-Qp8”, “uPe-GF-gNd”, and “vsq-Cc-fxu”这些的视图重复，只需要找到这些对应的重复部分删除即可