Re: Not sure sure if I should commit

[Ken T. <ke...@we...>]

On Mon, 18 Sep 2000, Michel [iso-8859-1] Dänzer wrote:

> Oh, I thought this was when you tried to commit. I think this is just a hint,
> CVS remember that there was a conflict, but you have dealt with it and so the
> commit should work fine. Otherwise, it will abort anyway :)

What I've done now is move my 2.2 out of the way and got a 'new' 2.2 (and
2.3) and diffed my old 2.2 against the fresh 2.2.  The only code changes
are mine but there are about 3000 lines of diffs in the CVS directories.
I don't know if this because I'm starting out again or if my old tree has
been corrupted.

I'll hold off on the commit and look into Geert's suggestion about the 2.4
way.

Ken.