[sr-dev] git:master:02074c81: Merge branch 'master' of github.com:kamailio/kamailio

[Victor Seva]

2017-10-16 13:30 GMT+02:00 Juha Heinanen <jh at tutpro.com>:
> Victor Seva writes:
>
>> rebase before pushing
>
> This is what I did (taken from shell history):
>
> 2060  emacs sipdump_mod.c
>  2061  git diff
>  2062  git commit -a
>  2063  git push
>  2064  git pull
>  2065  git push
>
> If I remember correctly, first git push failed with message asking to do
> pull first, which I did and then pushed again.
>
> What would have been the correct command sequence provided that I didn't
> remember to do 'git rebase'?

git pull --rebase is the missing step there. I have set pull rebase in
~/.gitconfig [0]

[pull]
    rebase = true


so git pull --rebase is automatic for me

[0] https://coderwall.com/p/tnoiug/rebase-by-default-when-doing-git-pull