Re: master 47070ed 6/6: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Eli Zaretskii]

> From: Robert Pluim <rpluim@gmail.com>
> Date: Wed, 12 May 2021 10:16:33 +0200
> Cc: Richard Stallman <rms@gnu.org>
> 
>     Richard> Author: Richard Stallman <rms@gnu.org>
>     Richard> Commit: Richard Stallman <rms@gnu.org>
> 
>     Richard>     Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
>     
>     Richard>     What choice do I have?

Richard, can you tell what caused you to ask that question?

> Before pushing you can use 'git pull --rebase' to automatically update
> to the HEAD of the branch youʼre on and then re-apply any commits
> you've made.

My suggestion is just "git pull", without rebasing.  Rebasing can
cause trouble in some rare situation, so we decided long ago not to
encourage that workflow (but if you know well enough what you are
doing, feel free to rebase).