<div class="gmail_quote">On Mon, Dec 6, 2010 at 6:48 PM, Boudewijn Rempt <span dir="ltr"><<a href="mailto:boud@valdyas.org">boud@valdyas.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi,<br>
<br>
We're having lots and lots of<br>
<br>
Merge branch 'master' of ssh://<a href="http://git.kde.org/calligra" target="_blank">git.kde.org/calligra</a><br>
<br>
type commits. Those are caused by pushing without rebasing first.<br>
<br>
So, instead of doing this:<br>
<br>
<br>
git pull, hack, commit, hack commit, git pull, git push<br>
<br>
do:<br>
<br>
git pull, hack, commit, hack, commit, git rebase origin master, pit push<br></blockquote><div><br>If I do this then I get the error:<br><br> To ssh://<a href="http://git@git.kde.org/calligra">git@git.kde.org/calligra</a><br>
! [rejected] master -> master (non-fast-forward)<br>error: failed to push some refs to 'ssh://<a href="http://git@git.kde.org/calligra">git@git.kde.org/calligra</a>'<br>To prevent you from losing history, non-fast-forward updates were rejected<br>
Merge the remote changes before pushing again. See the 'Note about<br>fast-forwards' section of 'git push --help' for details.<br></div></div>