Re: Merging release branch

[Eli Zaretskii]

> From: Dmitry Gutov <dgutov@yandex.ru>
> Date: Sat, 30 Oct 2021 15:30:30 +0300
> Cc: rgm@gnu.org, stefan@marxist.se, monnier@iro.umontreal.ca,
>  emacs-devel@gnu.org
> 
> > And of course, cherry-picking doesn't remove merge conflicts, they
> > will still need to be resolved.
> 
> By the author of the change, that's the point.

Btw, if this is what will make the situation better, we could merge ti
master immediately after pushing to the release branch, by the same
committer.