Xcode提交错误
问题描述：
我连接到一个git存储库。每次我想提交一些东西时，Xcode都会说“无法完成操作（com.apple.dt.IDESourceControlErrorDomain error -70。）”。按OK后，我可以进行修改，一切都很正常，但是很烦人。任何人都有解决方案？提前致谢。Xcode提交错误
答
我有同样的问题，我是一个基本的svn用户，所以我确定有一个更好的答案，但它帮助我，冲突是在我的project.xcodeproj文件，所以我关闭XCode，我创建了一个备份目前的项目，如果没有把握的快照功能，可以工作，由于该xcodeproj文件即将被改变，它可能会崩溃，我打开终端，我执行命令“SVN更新”，它提示我：
Conflict discovered in 'myProject.xcodeproj/project.pbxproj'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options:
我选'的'，然后我得到
(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file
(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)
(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)
(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this list
我选择'tc'，然后我再次打开了我的项目，并应用了我的更改。