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

There is a code conflict in these files. Manually maintain the conflict and then continue. It is recommended to use a client such as source tree to do this.