git - xcode 5 Commit代码后，pull出问题

Question

The operation could not be performed because of one or more tree conflicts.
The files .gitignore, xxx.plist, aaa.h, aaa.m, and aaa.xib had a tree conflict.

这样怎么提交代码啊？

Answer 1

这几个文件代码冲突了, 去手动维护下冲突,然后继续. 推荐用下source tree之类的客户端做这件事情.