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

[Daniel Narvaez]

Can you "git show HEAD" in that repo and show the output?

On Sunday, 23 June 2013, Chris Leonard wrote:

>
>
>
> 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
>


-- 
Daniel Narvaez
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sugarlabs.org/archive/sugar-devel/attachments/20130623/b992d95e/attachment.html>