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

[Aneesh Dogra]

> 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
>>
>
One possibility is that your copy of the repo is running behind the
upstream. You can try to rebase (git rebase) and then push.

-- 
Thanks
Aneesh Dogra (lionaneesh)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20130624/27a9a5fd/attachment.html>