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

Eli Zaretskii [18/Aug  3:32pm +03] wrote:
> 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?

Yes.

> 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.

I see, that's weird.  Thanks for dealing with it.

-- 
Sean Whitton