[isf-wifidog] CVS problem ?!

[Francois Proulx]

I'm having a hard time committing my work to the Sourceforge CVS. Apparently the branch we made is fuc**ng things up. I get a big fat error message saying that tags are in conflict ?

Ex.

cvs commit: sticky tag `HEAD' for file `sql/wifidog-postgres-initial-data.sql' is 
[...]
cvs [commit aborted]: correct above errors first!

Do you guys know how to fix this, I really need to commit as soon as possible.

Thank you