CVS merge 101

Today I faced the problem of manual merging a file that was modified by others.

A simple workaround to solve this issue, run 'cvs update' and then fix the file automatically generated by cvs (a merge between the two versions). CVS automatically adds these special comments in the file:

<<<<<<<< filename
My conflicting lines.
========
Others lines conflicting with my lines.
>>>>>>>> X.y

You have to manually edit the file to solve the conflict and remove all of these special comments.

Then, 'cvs ci' and the conflict it's gone.

A complete help of this and other problems with cvs can be found in Howto CVS