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