Re: Moving etc/NEWS around causing release branch merge to fail again

[Eli Zaretskii]

> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Tue, 13 Dec 2022 15:34:09 -0800
> Cc: emacs-devel@gnu.org
> 
> Stefan Kangas <stefankangas@gmail.com> writes:
> 
> > Eli Zaretskii <eliz@gnu.org> writes:
> >
> >> I don't use admin/automerge, I use admin/gitmerge.el in an interactive
> >> session.  It asked me whether to try resolving conflicts in NEWS; I
> >> answered YES.  Then it said it finished successfully.  I compared
> >> NEWS.29 on master with NEWS on the release branch, and saw that the
> >> entry for external-completion-table was lost; so I added it manually
> >> to NEWS.29.
> >
> > Thanks, I'll try a manual merge next time.
> 
> It happened again.

What happened, exactly?  Please tell more about what you saw.

> I spent an hour trying to fix the merge this time,
> and doing it manually with `M-x gitmerge' got me nowhere.  NEWS was
> still being modified, and it didn't prompt me about NEWS.  I ended up
> just fixing up NEWS manually after the merge, which is what I'll do from
> here on out.

Did you succeed in understanding the reason(s)?

> BTW, when doing manual merges, can everyone please try to make sure that
> etc/NEWS is *not* modified, or fix it manually.

You mean, the merge to NEWS.29 on master?  Which NEWS should not be
modified, and what do you mean by "manual merges"?