<div dir="ltr">You need fetch & pull:<div><br></div><div style>-> git fetch</div><div style>-> git pull --rebase</div><div style>-> git push</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
2013/6/24 Aneesh Dogra <span dir="ltr"><<a href="mailto:lionaneesh@gmail.com" target="_blank">lionaneesh@gmail.com</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">

<div><div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div dir="ltr"><div>Failed to commit file: [GIT] push of 
('/var/lib/pootle/checkouts/glucose/sugar', 'po/en_US.po') failed: To 
git@github.com:sugarlabs/sugar.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@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.

                        <br><br><br></div><div>cjl</div></div></blockquote></div></div></blockquote><div><br></div><div>One possibility is that your copy of the repo is running behind the upstream. You can try to rebase (git rebase) and then push.<span class="HOEnZb"><font color="#888888"><br>

</font></span></div><span class="HOEnZb"><font color="#888888"><div><br></div></font></span></div><span class="HOEnZb"><font color="#888888">-- <br>Thanks<br>Aneesh Dogra (lionaneesh)
</font></span></div></div>
<br>_______________________________________________<br>
Sugar-devel mailing list<br>
<a href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</a><br>
<a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a><br>
<br></blockquote></div><br><br clear="all"><div><br></div>-- <br>Ignacio Rodríguez
</div>