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.evans@manhattanproject.com
>
>
