[Dxspider-support] cvs - unusual Spider update result

[Eric Carling]

I had to trawl through the tree and remove those you note and a few others.
But once done, the update replaced them per Dirk's advice and the conflict
was resolved. Thanks Dirk.

Eric. 
 
-------Original Message-------
 
From: The DXSpider Support list
Date: 07/10/2004 18:01:04
To: dxspider-support at dxcluster.org
Subject: Re: [Dxspider-support] cvs - unusual Spider update result
 
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
 
_______________________________________________
Dxspider-support mailing list
Dxspider-support at dxcluster.org
http://www.tobit.co.uk/mailman/listinfo/dxspider-support
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.tobit.co.uk/pipermail/dxspider-support/attachments/20041007/e5c12386/attachment.html