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 add a keyword $log$ in my source file, but when i merge two branch, > the log is always conflict,how to avoid ? I *think* Tony fixed this in a recent version of CVSNT, take a look at the history to be sure. If you're using an earlier version though, the recommended way to avoid the conflict is to not use $Log$ keyword. That info is available through the CVS LOG command anyway (I think that's the jist of it, search the archives for the original thread). Glen Starrett