[Top][All Lists]

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

Re: CVS won't merge.

From: Larry Jones
Subject: Re: CVS won't merge.
Date: Fri, 14 Sep 2001 14:55:44 -0400 (EDT)

Jimmy Rimmer writes:
> The HEAD files on the repository contain changes that I've not yet merged
> into my files, but for some reason CVS seems to think that the version of
> the files I have are modified versions of the HEAD.

The first step is to figure out why CVS doesn't think that the
repository files have changed.  One possibility is that you have a
sticky tag or date associated with the files in your working directory
-- do a ``cvs status'' on one of the files to see.  If so, use ``update
-A'' to remove the sticky tag/date. 

-Larry Jones

The real fun of living wisely is that you get to be smug about it. -- Hobbes

reply via email to

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