[cvsnt] Re: how to control the update action merger the new change to local file without any comments?

Luigi D. Sandon cp at sandon.it
Tue Jan 18 13:53:51 GMT 2005


> Just merger the change, without any "<<<<<<<<<<XXXfile" or "=========="!

You can't, and it would only "trash" the file if possibile. CVSNT 
inserts those "comments" if and only if it is unable to merge the file 
properly, because it can't properly "synch" the contents. You can have 
dfm treated like binary files, and CVS will not try to merge them, or 
you have to merge them manually, sometimes, and it is not always 
possibile, especially with binary data within a dfm.

-- 
Luigi D. Sandon
cp at sandon.it





More information about the cvsnt mailing list