Xcode提交錯誤

Question

我連接到一個git存儲庫。每次我想提交一些東西時，Xcode都會說「無法完成操作（com.apple.dt.IDESourceControlErrorDomain error -70。）」。按OK後，我可以進行修改，一切都很正常，但是很煩人。任何人都有解決方案？提前致謝。

Answer 1

我有同樣的問題，我是一個基本的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'，然後我再次打開了我的項目，並應用了我的更改。