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

[Victor Seva]

2017-10-16 13:00 GMT+02:00 Juha Heinanen <jh at tutpro.com>:
> Victor Seva writes:
>
>> rebase before pushing
>
> Hard to remember. Is it possible to configure git so that it cancels
> push if local repo is not up to date?


See pull.rebase, branch.<name>.rebase and branch.autoSetupRebase in
git-config[1] if you want to make git pull always use --rebase instead
of merging.

> And even if had remembered to rebase, there would still be a cap between
> push during which a new commit could have occurred.  Sound broken system
> to me.

You can't push in that case. I would say git is not broken