[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Guus Leeuw
Subject: RE: "Results of Merge" persistent (false) conflict
Date: Thu, 9 Nov 2000 22:15:27 +0100

>  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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]