[Top][All Lists]

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

Re: Resolving conflict.

From: Fabrice Gautier
Subject: Re: Resolving conflict.
Date: Tue, 31 Oct 2000 21:51:14 +0100 (CET)
User-agent: IMP/PHP3 Imap webMail Program 2.0.11

En réponse à Dave Sherohman <address@hidden>:

> On Fri, Oct 27, 2000 at 11:45:41PM -0000, Fabrice Gautier wrote:
> > How do I told cvs that these are resolved ?
> >
> > (cvs bible say commit, but i can't I'm read-only)
> You just answered your own question:  You can't resolve the conflict
> because
> you're read-only.

No, the fact is I can. (Otherwise, this would be a bug not a feature)
I had forgotten a conflict marker in the source, once removed its status was M 
(Modified) not C (Conflict)


Fabrice Gautier

reply via email to

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