Re: Merging release branch

[Glenn Morris]

Eli Zaretskii wrote:

> What's the procedure with merging commits that change etc/NEWS on the
> release branch?

gitmerge.el does have special handling for NEWS (I wrote it).
https://debbugs.gnu.org/29366

git reset --hard 5a01383
emacs -Q -nw -l ./admin/gitmerge.el -f gitmerge
RET
m
y # "Try to fix NEWS conflict?"
y
y

works for me.

Surely you weren't saying "n" to "Try to fix NEWS conflict?"...