[cvsnt] Unable to resolve merge conflicts

[Gerhard Fiedler]

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...

Gerhard