CVS out-of-date errors vs status page

[Clytie Siddall <clytie riverland net au>]

Hi guys :)

I'm getting quite a few out-of-date errors from CVS while updating  
HEAD files.

The odd thing about these errors is:

1. I download my file from the latest status page, so
2. there isn't a later file available from the status page and
3. usually the CVS file is older, not newer

Example: gnomemeeting, which I've just tried to commit
____
<<<<<<< vi.po
"POT-Creation-Date: 2005-12-29 22:49+0100\n"
"PO-Revision-Date: 2005-12-30 16:46+1030\n"
=======
"POT-Creation-Date: 2005-06-23 05:04+0000\n"
"PO-Revision-Date: 2005-06-24 18:32+0930\n"
>>>>>>> 1.10
____

vi.po is my current file.

How do I commit my files?

from Clytie (vi-VN, Vietnamese free-software translation team / nhÃm  
Viát hÃa phán mám tá do)
http://groups-beta.google.com/group/vi-VN