httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@gonzo.ben.algroup.co.uk>
Subject Re: cvs problem
Date Sun, 02 Jun 1996 10:55:47 GMT
Aram Mirzadeh wrote:
> 
> 
> 
> Anyone know what this is: 
> 
> ....
> ....
> U apache/src/mod_auth_anon.c
> RCS file: /export/home/cvs/apache/src/mod_auth_msql.c,v
> retrieving revision 1.4
> retrieving revision 1.6
> Merging differences between 1.4 and 1.6 into mod_auth_msql.c
> rcsmerge: warning: conflicts during merge
> cvs server: conflicts found in apache/src/mod_auth_msql.c
> C apache/src/mod_auth_msql.c

Yes. It means you have made changes to your local copy of mod_auth_msql.c which
conflict with changes in the repository. Edit the file and look for >>>>> or
<<<<< which will bracket the conflicting changes. Resolve the conflicts and
then do "cvs update".

Cheers,

Ben.

> U apache/src/mod_cgi.c
> ....
> ....
> 
> <Aram>
> -- 
> Aram Mirzadeh						awm@qosina.com
> MIS Manager				      Apache httpd team member
> Qosina Corporation				    aram@hyperreal.com
> http://www.qosina.com/			    http://www.qosina.com/~awm
> 
> You're not drunk if you can lie on the floor without holding on.
>                 -- Dean Martin
> 

-- 
Ben Laurie                  Phone: +44 (181) 994 6435
Freelance Consultant and    Fax:   +44 (181) 994 6472
Technical Director          Email: ben@algroup.co.uk
A.L. Digital Ltd,           URL: http://www.algroup.co.uk
London, England.

Mime
View raw message