Re: master 3c680886ec0 02/12: ; Merge from origin/emacs-31

> From: Sean Whitton <[email protected]>
> Date: Tue, 18 Aug 2026 12:02:53 +0100
> 
> Eli Zaretskii [15/Aug 11:08am -04] wrote:
> > branch: master
> > commit 3c680886ec069eb9247d759483178403706416ef
> > Merge: 080e2603df3 ab5062855de
> > Author: Eli Zaretskii <[email protected]>
> > Commit: Eli Zaretskii <[email protected]>
> >
> >     ; Merge from origin/emacs-31
> >
> >     The following commits were skipped:
> >
> >     ab5062855de ; * etc/NEWS: Move "Miscellaneous" to end of its section.
> >     75b4b8932f4 ; * etc/NEWS: Copyedit.
> >     f561bc6c370 ; * etc/NEWS: Use a non-commercial example.
> 
> Why did you skip these?
> Don't we want NEWS.30 on master to be up-to-date?

??? What does NEWS.30 have to do with this?  Did you mean NEWS.31?

If you meant NEWS.31 on master, then it is currently identical to
etc/NEWS on the release branch (and also to etc/NEWS in the RC
tarball), and that's how it should be, no?

But if you want the gory details, then that merge was a fiasco:
gitmerge for some reason decided to merge the changes in etc/NEWS on
the branch with the master's etc/NEWS (and NOT with etc/NEWS.31),
which of course cannot be right.  I tried several things to avoid
that, including skipping NEWS changes on the branch, but nothing
worked.  Eventually I simply overwrote etc/NEWS.31 on master with
etc/NEWS from the branch (which is what gitmerge should do, but what
do I know?).  So I don't think any changes you did are actually
missing, I think the log entries above are just hallucinations,
perhaps caused by my failed attempts to prevent the merge snafu.