[cvsnt] Re: How to surpress merge on cvs update?

[Tony Hoyle]

Siegfried Heintze wrote:
> When I do an update, how do I suppress a merge? I made some changes in
> sandbox #1 and did a commit. Then I logged into another computer to perform
> the build and did cvs update -d. This did a merge, however. Not what I
> wanted.

update -C.  This also keeps a copy of any local changes so you're not 
losing anything accidentally (the brute force method is to delete the 
originals but in that case if you forgot to commit you've lost anything 
you might have wanted to keep).

Tony