[cvsnt] how to resovle conflicting generated from CVS macro

Arthur Barrett arthur.barrett at march-hare.com
Thu Feb 14 21:43:36 GMT 2008

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.


> In my source files, I have macros such as $Log$, $Id$ in comment
> section.  So for every checkin, there is an entry added to record the
> time and checkin messages.  When I try to merge the files 
> from branch to
> head, all those files are shown conflicting though the code is same.

This has been a problem with $Log$ since the dawn of time and is clearly
not recommended for that reason in the manual:

The problem shouldn't occur with $Id$ though - if you have problems just
ue -ko to switch off $Id$ expansion at checkout.  Wont help with $Log$



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook