Re: ChangeLog.4

[Eli Zaretskii]

> From: Sean Whitton <spwhitton@spwhitton.name>
> Cc: luangruo@yahoo.com,  emacs-devel@gnu.org
> Date: Thu, 18 May 2023 10:50:28 -0700
> 
> > AUTHORS is not supposed to be merged, see gitmerge.el.  AUTHORS is
> > only important when tarring a release or a pretest, and that never
> > happens from master.
> 
> Ah sure, but then, how did it end up being the Emacs 29 version on
> master and not some much older version?

Because we don't take any special measures to prevent it from being
merged, so sometimes it does, depending on who does the merge.  It's
no big deal.  AUTHORS reflects the state of the branch from which it
is regenerated, and that is never master, so even if we merge AUTHORS,
its contents doesn't reflect the contributions in master anyway.