Re: Merging release branch

[Eli Zaretskii]

> Date: Sat, 30 Oct 2021 23:14:00 +0000
> From: Gregory Heytings <gregory@heytings.org>
> cc: Dmitry Gutov <dgutov@yandex.ru>, rgm@gnu.org, larsi@gnus.org, 
>     stefan@marxist.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org
> 
> > 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.
> 
> This could be automated with a server-side hook, whose execution would 
> depend on some tag in the commit message which would indicate whether the 
> commit should or should not be merged into the trunk.

The problematic part of merging is when there are conflict, and that
cannot be done by the server.  If there are no conflicts, using
gitmerge.el is so simple it doesn't deserve any discussion.