http://blog.csdn.net/collonn/article/details/39259227
每次修改或打开commit
Xcode common B 没有错误为止
pull
如果报警
You now have merge conflicts in your working copy that need to be resolved before continuing.You can do this by selecting the conflicted files and using the options under the 'Resolve Conflicts' menu.
不要push
打开xcode编译会提示哪一行冲突
解决冲突
commit
pull
不报警告
push
超时
重复
网友评论