Quote:
|
Originally Posted by Iveky3
why i get these messages and is it critical?
...
RCS file: /cvs/tuxbox/apps/tuxbox/enigma/po/fi.po,v
retrieving revision 1.18
retrieving revision 1.1.2.6
Merging differences between 1.18 and 1.1.2.6 into fi.po
rcsmerge: warning: conflicts during merge
cvs checkout: conflicts found in apps/tuxbox/enigma/po/fi.po
C apps/tuxbox/enigma/po/fi.po
...
I get them on many files.
|
It means that cvs is unable to merge code changes between 1.8 and 1.1.2.6 automatically. If it happens on a lot of files I suggest you re-checkout the above.