Re: Not sure sure if I should commit

[Ken T. <ke...@we...>]

On Sun, 17 Sep 2000, Michel [iso-8859-1] Dänzer wrote:

> > File: ppc_ksyms.c       Status: File had conflicts on merge

> Look at the file. If there's a conflict, there is at least one line that
> consists only of a lot of '<', then some lines of code, then a line with only
> '=', some code again and finally a line with only '>'. CVS couldn't merge the
> two code bits on its own. Do it manually and you should be able to commit.

That's what i got the first time as i didn't have the MOL changes in
ppc_ksyms and got the conflict <<<===>>> markers. Moved my changes out of
the way, did update -D now (thank you) to get the MOL changes, put my
changes back in ppc_ksyms.

If I do cvs diff everthing looks OK, shows my changes, no conflict markers
but cvs status still says 'File had conflicts on merge'.

I'll do some more investigating but i'm fooled (which is not hard).

Ken.