Re: Merging release branch

[Eli Zaretskii]

> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Sun, 31 Oct 2021 15:46:21 +0100
> Cc: rgm@gnu.org, stefan@marxist.se, emacs-devel@gnu.org,
>  Gregory Heytings <gregory@heytings.org>, monnier@iro.umontreal.ca,
>  Eli Zaretskii <eliz@gnu.org>
> 
> Dmitry Gutov <dgutov@yandex.ru> writes:
> 
> > 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).
> 
> This reminds me -- another advantage to the cherry-picking approach is
> that the "master" VC history remains clean and easy to understand, while
> doing all these merges makes it full of noise.

We've discussed this long ago and decided we didn't care.  The master
history cannot be clean anyway, because when there's a race between
two committers pushing at the same time, one of them will look like a
merge from a branch.