Re: cvs commit error

[Juergen Reuter]

See, for example,

http://www.tigris.org/nonav/scdocs/ddCVS_cvscontributing.html#cvsresolving

Greetings,
Juergen



On Tue, 30 Aug 2005, Pocentek Gauvain wrote:

> Hi,
>
> I've just committed updated french files and get this:
>
> cvs server: file `po/newweb.pot' had a conflict and
> has not been modified
> cvs [server aborted]: correct above errors first!
>
> I absolutly don't know what is to be done.
>
> Gauvain
>
>
>
>
>
>
> ___________________________________________________________________________
> Appel audio GRATUIT partout dans le monde avec le nouveau Yahoo! Messenger
> Téléchargez cette version sur http://fr.messenger.yahoo.com
>
>
> _______________________________________________
> lilypond-devel mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/lilypond-devel