[cvsnt] Unable to resolve merge conflicts

Gerhard Fiedler lists at connectionbrazil.com
Tue Aug 1 18:26:49 BST 2006

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.

Tony Hoyle wrote:

> Tony Eva wrote:
>> I meant that CVS(NT) "knows" in the sense that it will permit
>> a commit instead of blocking it.  If I edit a file after a
> It doesn't 'know' anything other than the timestamp has changed.  It's 
> just a simple safeguard against committing conflicts - if you simply 
> touch the file and don't change it you can bypass that.

I think what Tony Eva means is that this changed timestamp should change
the cvs status from "conflict" to "modified". This has some logic for it...


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