Question

我连接到git存储库。每次我想提交一些东西时，Xcode都说“操作无法完成。（com.apple.dt.IDESourceControlErrorDomain error -70。）”。按下确定后，我可以提交更改，一切看起来都很好，但这很烦人。有人有解决方案吗？提前致谢。

Answer 1

我有同样的问题，我是一个基本的svn用户，所以我确信有一个更好的答案，但它帮助了我，冲突在我的project.xcodeproj文件，所以我关闭了XCode，我创建了一个备份当前项目，不确定快照功能是否可以正常工作，因为xcodeproj文件即将被更改并且可能会崩溃，我打开了终端，然后我执行了命令“svn update”它提示我：

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:

我选择了's'，然后我得到了

  (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'然后我再次打开我的项目并应用了我的更改。

在Xcode中提交错误

1 个答案: