svn – Xcode和SCM冲突错误

即使我是唯一一个从事这个项目的人,我也会收到以下错误.

> Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed

为什么会发生这种情况,因为我所做的就是每次都要在做一些严肃的编码之前提交项目.我已经提交了三次现在它不再允许,因为它抛出了这个错误.

最佳答案
你有一个需要在svn中解决的冲突.如果它不是其中一个文件,请检查它是否是树冲突.

SVN 1.6 release notes

Subversion 1.6 recognizes a new kind of conflict, known as a “tree conflict”. Such conflicts manifest at the level of directory structure, rather than file content.

Situations now flagged as conflicts include deletions of locally modified files, and incoming edits to locally deleted files. Files and directories which are victims of a tree conflict cannot be committed before the conflict is marked resolved.

Note that Subversion is still treating renames as a “copy+delete” operation, so file renames causing tree conflicts can only be detected in terms of file additions and deletions. Because of this, false positives during tree conflict detection are possible.

To facilitate tree conflict detection, attempting to commit the deletion of a file which has already been deleted in the HEAD revision now causes an error. In Subversion 1.5, this was treated as a no-op, potentially resulting in “empty” revisions which contained no changes.

转载注明原文:svn – Xcode和SCM冲突错误 - 代码日志