xcode 5 Commit代码后，pull出问题
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.
这样怎么提交代码啊？
邻居的耳朵
11 years, 7 months ago
