[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: cvs merge

From: Mike Castle
Subject: Re: cvs merge
Date: Wed, 6 Dec 2000 11:03:25 -0600
User-agent: Mutt/1.3.6i

On Wed, Dec 06, 2000 at 11:16:09AM -0500, Largent, Jim wrote:
> Is there any way to stop CVS from always trying to merge your code? 

Why would you want to do that?  (serious question, what are you trying to

I can think of two things:

You don't want to keep your changes.
You don't want to see other's changes.

First is easy, delete the file then do cvs update.
Second is a bit more complicated, but basically comes down to:  don't do a
cvs update.  (You could, for instance, do cvs -n up, then manually update
files that you do want to see changes for).

If you need to commit and others have changed the file too, and you are
certain, VERY VERY CERTAIN that you don't want those changes, then rename
your file, cvs update, copy your renamed file over the file just checked
out, then commit.  THIS WILL LOSE CHANGES!

       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen

reply via email to

[Prev in Thread] Current Thread [Next in Thread]