using git: rebase, not putll before push

[Sven Langkamp]

On Mon, Dec 6, 2010 at 6:48 PM, Boudewijn Rempt <boud at valdyas.org> wrote:

> Hi,
>
> We're having lots and lots of
>
> Merge branch 'master' of ssh://git.kde.org/calligra
>
> type commits. Those are caused by pushing without rebasing first.
>
> So, instead of doing this:
>
>
> git pull, hack, commit, hack commit, git pull, git push
>
> do:
>
> git pull, hack, commit, hack, commit, git rebase origin master, pit push
>

If I do this then I get the error:

 To ssh://git@git.kde.org/calligra
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'ssh://git@git.kde.org/calligra'
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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20101206/e5dbcb19/attachment.htm>