[Dxspider-support] cvs - unusual Spider update result

[Bob Nielsen]

On Thu, Oct 07, 2004 at 05:38:10PM +0100, Dirk Koopman wrote:
> If you ever get any files with a conflict ('C') the best thing to do
> is to remove the files with the 'C' and do another cvs update.
> 
> It will replace them with non-conflicting ones.
> 

I did this with html/mrtg/.cvsignore and mrtg/.cvsignore, but the next 
time I run cvs update, the conflict reappears.

Bob, N7XY