Re: Merging release branch

[Dmitry Gutov]

On 31.10.2021 10:20, Eli Zaretskii wrote:
> > 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.

A server-side check could be used to do the check "lazily" and only do 
one merge commit per day (or week, etc), rather than filling the master 
history with merge commits (where their ration to "real" commits could 
be approaching 100% if we ask everyone to merge right away).