<HTML><HEAD>
<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<META content="IncrediMail 1.0" name=GENERATOR></HEAD>
<BODY style="BACKGROUND-POSITION: 0px 0px; FONT-SIZE: 12pt; MARGIN: 5px 10px 10px; FONT-FAMILY: Arial" bgColor=#ffffff background="" scroll=yes ORGYPOS="0">
<TABLE id=INCREDIMAINTABLE cellSpacing=0 cellPadding=2 width="100%" border=0>
<TBODY>
<TR>
<TD id=INCREDITEXTREGION style="FONT-SIZE: 12pt; CURSOR: auto; FONT-FAMILY: Arial" width="100%">
<DIV>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.</DIV>
<DIV> </DIV>
<DIV>Eric. </DIV>
<DIV> </DIV>
<DIV id=IncrediOriginalMessage><I>-------Original Message-------</I></DIV>
<DIV> </DIV>
<DIV id=receivestrings>
<DIV dir=ltr style="FONT-SIZE: 11pt" <i><B>From:</B></I> <A href="mailto:dxspider-support@dxcluster.org">The DXSpider Support list</A></DIV>
<DIV dir=ltr style="FONT-SIZE: 11pt" <i><B>Date:</B></I> 07/10/2004 18:01:04</DIV>
<DIV dir=ltr style="FONT-SIZE: 11pt" <i><B>To:</B></I> <A href="mailto:dxspider-support@dxcluster.org">dxspider-support@dxcluster.org</A></DIV>
<DIV dir=ltr style="FONT-SIZE: 11pt" <i><B>Subject:</B></I> Re: [Dxspider-support] cvs - unusual Spider update result</DIV></DIV>
<DIV> </DIV>
<DIV>On Thu, Oct 07, 2004 at 05:38:10PM +0100, Dirk Koopman wrote:</DIV>
<DIV>> If you ever get any files with a conflict ('C') the best thing to do</DIV>
<DIV>> is to remove the files with the 'C' and do another cvs update.</DIV>
<DIV>></DIV>
<DIV>> It will replace them with non-conflicting ones.</DIV>
<DIV>></DIV>
<DIV> </DIV>
<DIV>I did this with html/mrtg/.cvsignore and mrtg/.cvsignore, but the next</DIV>
<DIV>time I run cvs update, the conflict reappears.</DIV>
<DIV> </DIV>
<DIV>Bob, N7XY</DIV>
<DIV> </DIV>
<DIV>_______________________________________________</DIV>
<DIV>Dxspider-support mailing list</DIV>
<DIV><A href="mailto:Dxspider-support@dxcluster.org">Dxspider-support@dxcluster.org</A></DIV>
<DIV><A href="http://www.tobit.co.uk/mailman/listinfo/dxspider-support">http://www.tobit.co.uk/mailman/listinfo/dxspider-support</A></DIV></TD></TR>
<TR>
<TD id=INCREDIFOOTER width="100%">
<TABLE cellSpacing=0 cellPadding=0 width="100%">
<TBODY>
<TR>
<TD width="100%"></TD>
<TD id=INCREDISOUND vAlign=bottom align=middle></TD>
<TD id=INCREDIANIM vAlign=bottom align=middle></TD></TR></TBODY></TABLE></TD></TR></TBODY></TABLE></BODY></HTML>