Two users independently change the same line. First user commits change with no problem. Second user goes to commit change and cannot:
$ cvs ci -m "Changed first print statement to be more specific." hello.py cvs commit: Up-to-date check failed for `hello.py' cvs [commit aborted]: correct above errors first! $
Second user needs to update, and will see conflict note on doing so:
$ cvs update cvs update: Updating . RCS file: /home/cvsroot/hello/hello.py,v retrieving revision 1.9 retrieving revision 1.10 Merging differences between 1.9 and 1.10 into hello.py rcsmerge: warning: conflicts during merge cvs update: conflicts found in hello.py C hello.py $
Second user must now edit the file, find the conflict markers and decide which text to keep (hopefully in communication with first user):
<<<<<<< hello.py print "\n\nSTRING: " + string ======= print "Your string is -->", string >>>>>>> 1.10
Local version is first, followed by "=======", followed by repository version.