[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging release branch
|
From: |
Eli Zaretskii |
|
Subject: |
Re: Merging release branch |
|
Date: |
Sat, 06 Nov 2021 19:19:46 +0200 |
> From: Glenn Morris <rgm@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Sat, 06 Nov 2021 12:11:12 -0400
>
> 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?"...
No, I was saying "y" (I think), and then it would put me in a buffer
with conflicts, all of which were from trying to merge the branch's
NEWS into the master's.
I guess some debugging is in order.