Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
> >I'm having a problem with a conflict after cvs merge (after update) > >in the $Log$ section. Local file's log looks as follows: I think it's normal to get conflicts in those sections... Is it????? It does seem like CVSNT should be smart enough not to flag it as a conflict. Regards, Glen Starrett