Conflict Resolution

CVS marks conflicts with in-line б╚conflict markersб╩, and prints a C during an update. Historically, this has caused problems, because CVS isn't doing enough. Many users forget about (or don't see) the C after it whizzes by on their terminal. They often forget that the conflict-markers are even present, and then accidentally commit files containing conflict-markers.

Subversion solves this problem by making conflicts more tangible. It remembers that a file is in a state of conflict, and won't allow you to commit your changes until you run svn resolved. See б╚п═п╟п╥я─п╣я┬п╣п╫п╦п╣ п╨п╬п╫я└п╩п╦п╨я┌п╬п╡ (п©я─п╦ я│п╩п╦я▐п╫п╦п╦ я│ я┤я┐п╤п╦п╪п╦ п╦п╥п╪п╣п╫п╣п╫п╦я▐п╪п╦)б╩ for more details.