[cvsnt] Merge issue

Tony Hoyle tony.hoyle at march-hare.com
Thu Jan 25 14:08:39 GMT 2007

Sebastien Abras wrote:
> When USER_A updated, CVS told him he was merging changes from USER_B but 
> in fact, it was not, every changes USER_B made were discarded 
> (unfortunatly we discovered it after the merged file was commited)

USER_A had an editor open and saved the unmerged file, deleting the 
changes (and perforce would have done exactly the same thing in the 

Either always use editors that detect on-disk changes or enforce the 
rule that all editors must be shut down before updating.


More information about the cvsnt mailing list