RE: "Results of Merge" persistent (false) conflict

[Guus Leeuw]

>  From: address@hidden 
>  [mailto:address@hidden Behalf Of
>  Robert Bresner
>  CVS client/server 1.10.8

Try upgrading to CVS 1.11.

[ Situation snipped for brevity ]

>  This is, of course, dangerous. Since I'm sure one 
>  day I'll miss a conflict in the file, and check in
>  something which still has a conflict. 

Actually, CVS should prohibit / prohibits the check in
if there still is a conflict.

>  Why does this happen, and how can I make it stop?

Do you have more details like:
1) CVS/Entries before and after the update
2) The corresponding source file before and after the update
3) The corresponding file on the CVS Server

This might help find the problem, and then somebody (probably
me now *grin*) could fix it.

Guus