Subject: Re: cvs: is it normal?
To: Wojciech Puchar <wojtek@tensor.3miasto.net>
From: Chuck Swiger <cswiger@mac.com>
List: netbsd-users
Date: 08/01/2005 21:00:36
Wojciech Puchar wrote:
> that on update it refetches EVERY file with "C", before each it write
> that it's moving it away.
>
> after finished update, next update does the same.
Reading behind the lines, I would gather you have experienced a conflict due to
two people changing the same place in the same file. Someone needs to edit the
file after this happens and resolve the conflicting area. Search for "<<<<<",
then re-commit the fixed version.
--
-Chuck