Re: [xineliboutput-devel] cvs update: conflicts found in po/it_IT.po

[Petri h. <phi...@us...>]

Goga777 wrote:
> Hi
> 
> today I tried to update xineliboutput and received follow messages during of compilation
> 
> goga:/usr/src/vdr170/PLUGINS/src/xineliboutput# cvs update
> cvs update: Updating .
> P HISTORY
> cvs update: Updating examples
> cvs update: Updating examples/Live Radio
> cvs update: Updating patches
> cvs update: Updating po
> M po/cs_CZ.po
> M po/de_DE.po
> M po/fi_FI.po
> RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/po/it_IT.po,v
> retrieving revision 1.8
> retrieving revision 1.9
> Merging differences between 1.8 and 1.9 into it_IT.po
> rcsmerge: warning: conflicts during merge
> cvs update: conflicts found in po/it_IT.po
> C po/it_IT.po

Just remove the file po/it_IT.po and run "cvs update" again. It has been
modified during compilation and cvs does not know how to update it.


- Petri