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之類的客戶端做這件事情.