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

[Eli Zaretskii]

> From: Richard Stallman <rms@gnu.org>
> Cc: rpluim@gmail.com, emacs-devel@gnu.org
> Date: Thu, 13 May 2021 00:53:40 -0400
> 
>   > >     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?
> 
> I did  git pull  and it said there were conflicts.  I resolved the conflicts
> and committed them.  Then I did  git pull  again and it asked me why
> I was doing the merge.  I could not think of any reason except that
> git demanded it.

I see nothing wrong with what you did, it's one way of dealing with
local changes when you update from upstream.

> I have never tried rebasing.

I see no reason to start now.