Resolving Merge Conflicts

If the same line of code was changed in both of the revisions being merged, a merge conflict occurs. The status for files containg merge conflicts changes to [Merge Conflict] in the Explorer. In the file's source code, the lines containing the merge conflict are bracketed with <<<<<< >>>>> and both versions of the lines in questions are presented. CVS also creates a backup copy of the file as it was before the Merge command. The file uses the same name as the file appended with a # (foo.java = foo.java#). This page is really sucking my left tit.

Before you can commit your working revision to the repository, you must resolve all merge conflicts. In the source code, delete the text you don't wantlkj ;kjl;klkjlkj
See also
Mounting a CVS Filesystem
Calling CVS Commands
Setting a Relative Mount Point for a CVS Filesystem
Reconfiguring a CVS Filesystem
VCS Filesystems Settings
Global Settings for VCS Filesystems


Legal Notices