Re: Missing changes in merges from emacs-25 to master

[Paul Eggert]

On 03/22/2016 10:03 AM, Eli Zaretskii wrote:
> > "git rebase" should do the trick.
> We've been through this: "git rebase" will cause much worse trouble if
> you have local merge-commits from feature branches.  So I at least
> will never use "git rebase" unless I have no other choice.

For complex clashes such as the one you describe, you might try redoing 
the failed push from a clean new master branch rather than attempting 
"git pull / git push".  Something like this:

$ git push
[ fails due to somebody else committing in the meantime ]
$ git branch -m master master-clashed
$ git branch --track master origin/master
$ git checkout master
$ git pull
[ now, merge your changes again ]
$ git push