[Sugar-devel] errors on commit to git hub from Pootle

[Chris Leonard]

After working for a while, I'm now getting effors on attemptingto commit
from Poolte to git hub.  Any ideas on how to resolve?


Failed to commit file: [GIT] push of
('/var/lib/pootle/checkouts/glucose/sugar', 'po/en_US.po') failed: To
git at github.com:sugarlabs/sugar.git ! [rejected] master -> master
(non-fast-forward) error: failed to push some refs to
'git at github.com:sugarlabs/sugar.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again. See the 'Note about
fast-forwards' section of 'git push --help' for details.


cjl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20130622/2edaf383/attachment.html>