From: | Clark Evans <clark(dot)evans(at)manhattanproject(dot)com> |
---|---|
To: | hackers(at)postgresql(dot)org |
Subject: | CVS overwrite on merge fail? |
Date: | 1999-02-18 19:24:05 |
Message-ID: | 36CC68D5.3B38A9F5@manhattanproject.com |
Views: | Raw Message | Whole Thread | Download mbox | Resend email |
Thread: | |
Lists: | pgsql-hackers |
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 | Egon Schmid | 1999-02-18 19:36:13 | Re: [HACKERS] CVS overwrite on merge fail? |
Previous Message | Peter T Mount | 1999-02-18 19:23:01 | Re: [HACKERS] Continued problems with pgdump, Large Objects and crashing backends |