CVS 使用嵌入“冲突标志”来标记冲突，并且在更新或合并操作时打印 C。历史上，这导致了许多问题，因为 CVS 做得还不够。许多用户在它们快速闪过终端时忘记(或没有看到) C。即使出现了冲突标记，他们也经常忘记，然后提交了带有冲突标记的文件。

Subversion solves this problem in a pair of ways. First, when a conflict occurs in a file, Subversion records the fact that the file is in a state of conflict, and won't allow you to commit changes to that file until you explicitly resolve the conflict. Second, Subversion provides interactive conflict resolution, which allows you to resolve conflicts as they happen instead of having to go back and do so after the update or merge operation completes. See 第 4.5 节 “解决冲突” for more about conflict resolution in Subversion.