[GRASS5] [bug #915] (grass) src/CMD/head/head.in
glynn.clements at virgin.net
Fri Feb 8 12:11:35 EST 2002
Request Tracker wrote:
> Subject: src/CMD/head/head.in
> After ./configure, I ran make. And got zillions of errors about
> a bad separator on line 55 of make.rules. It seems that
> src/CMD/head/head.in is the culprit.
> <<<<<<< head.in
> #LDFLAGS = @STRIPFLAG@ @LDFLAGS@
> LDFLAGS =
> LDFLAGS = @LDFLAGS@
> >>>>>>> 1.38
This is the result of a conflict when running "cvs update".
It occurs when you attempt to update a file which has been modified
locally, and the patch fails to apply to the local version.
The simplest fix is:
cvs update src/CMD/head/head.in
In general, whenever you run "cvs update", check the output for any
warnings or conflicts. Conflicts will generate a warning, and the
corresponding file will have the "C" status flag (files which are
updated successfully have "U" or "P").
Glynn Clements <glynn.clements at virgin.net>
More information about the grass-dev