Hi, On Tue, 2003-08-19 at 04:47, Daniel Rogers wrote: > the makefiles in gegl/gegl in cvs seem to be broken. Here is the error > on a "make clean" > > Makefile:502: *** missing separator. Stop. > > 502 of makefile.am looks like : > 501: ======= > 502: >>>>>>> 1.61 > > This is not a makefile syntax I am familar with, but it seems to > correspond with: > > 127: <<<<<<< Makefile.am > > and there is a similar syntax in Makefile.am > > What is going on here? This a merge conflict. CVS had problems to merge your changes with the changes in the repository. cvs update should have told you about this. Sometimes people check in this stuff but this time it looks like the problem is in your tree only. You'll have to merge the changes manually and remove the conflict markers. Sven
