[Lxde-i18n] Apparant problem with git and committing online translation work to VCS

[Kizito B. <kbi...@ya...>]

Hello,

Thanks for all the work going on to sort out the pootle server.

The commit failure failure message about no-existant po files that I used to get has stopped. However there is still some trouble with commiting work to VCS; When I attempt to commit now it produces this message:

"Failed to commit lxpanel/po/lg.po to version control: [GIT] push of ('/var/www/pootle/repos/lxpanel', 'po/lg.po') failed: To gi...@gi...:/lxde/lxpanel.git ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'gi...@gi...:/lxde/lxpanel.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details." 


The next attempt to commit without making further changes to the translation results in a message saying that there are no changes to commit. I am not sure whether this means that the work is being committed and the failure message is a mistake or whether the 'no changes' messages is the incorrect one.

Thanks in advance for advice on what is happening.


Regards,

Kizito
Luganda (lg, 'Ganda') team