Re: [HACKERS] CVS and the backend

Peter T Mount <peter(at)retep(dot)org(dot)uk> writes:
> I've just run CVS UPDATE again, in another attempt to get initdb to run.
> Anyhow, I noticed that there was a message saying that there were
> conflicts. Any ideas?

That means CVS got confused about how to update your local file.
Typically, it means that the file now on your disk is broken ---
it will have both versions of the conflicting text. CVS is expecting
you to sort it out, which would be the right thing if the difference
involved a change that you needed to commit to the source tree.

If the conflict is in a file that you have not got interesting private
changes in, the best thing is just to delete the local copy of that file
and do cvs update again to fetch a clean copy.

regards, tom lane