From: | Egon Schmid <eschmid(at)stuttgart(dot)netsurf(dot)de> |
---|---|
To: | Clark Evans <clark(dot)evans(at)manhattanproject(dot)com> |
Cc: | hackers(at)postgreSQL(dot)org |
Subject: | Re: [HACKERS] CVS overwrite on merge fail? |
Date: | 1999-02-18 19:36:13 |
Message-ID: | Pine.NEB.3.95.990218203323.15430D-100000@delos.stuttgart.netsurf.de |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-hackers |
Delete that gram.c and do another cvs update. The other way would be to
edit gram.c and looking for <<<<<< and >>>>>>. Deleting gram.c and make
another cvs update is faster.
-Egon
On Thu, 18 Feb 1999, Clark Evans wrote:
> I was wondering if there is a way in CVS
> to tell it to kill my local copy of a file
> if there is a problem with merge? I didn't
> change or patch these files, but every once
> and a while something like this happens:
>
> -------------------------------------------------
> P src/backend/parser/analyze.c
> RCS file: /usr/local/cvsroot/pgsql/src/backend/parser/gram.c,v
> retrieving revision 2.71
> retrieving revision 2.73
> Merging differences between 2.71 and 2.73 into gram.c
> rcsmerge: warning: conflicts during merge
> cvs server: conflicts found in src/backend/parser/gram.c
> C src/backend/parser/gram.c
> ----------------------------------------------------------------
>
> any suggestions woudl be way cool.
>
> Thank you
> ClarkEvans
> clark(dot)evans(at)manhattanproject(dot)com
>
>
From | Date | Subject | |
---|---|---|---|
Next Message | Bruce Momjian | 1999-02-18 19:50:39 | Re: [HACKERS] CVS overwrite on merge fail? |
Previous Message | Clark Evans | 1999-02-18 19:24:05 | CVS overwrite on merge fail? |