Re: master bdda935 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Cc: eggert@cs.ucla.edu,  rpluim@gmail.com,  emacs-devel@gnu.org
> Date: Mon, 17 Aug 2020 20:03:58 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > Please don't.  It can cause subtle problems in some rare cases.  Or at
> > least that's how it was in the past.
> 
> If so, it's changed.  There's nothing magical much about rebasing:

I didn't say it was magical, I said it can cause subtle problems.  I
forget the details, but rebasing after merging could bring the same
commit more than once.  Or something like that.

Why do you feel the need to rebase?  The default merge that pull does
is as "non-magical" as rebase.

> Seems pretty safe to me.

Until it isn't.