Re: [External] : emacs-28 windows binaries available from alpha

[Eli Zaretskii]

> From: Andrea Corallo <akrl@sdf.org>
> Cc: dieter@duenenhof-wilhelm.de, corwin@bru.st, emacs-devel@gnu.org
> Date: Thu, 10 Feb 2022 13:36:10 +0000
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > Fine with me, please install on the release branch.  But please add
> > there a comment explaining why we do this, and mention that it's for
> > MS-Windows (you can take the text from the comment I wrote for my
> > comp.c patch, which will now not be needed).
> 
> Done with 202d3be873.

Thanks.

> PS I tried to merge emacs-28 into master using gitmerge.el as suggested
> in git-workflow as I suspected a conflict there that I wanted to solve
> myself, but it says "nothing to merge".  Not sure if I'm doing something
> wrong.

I merged that change, but for the future: what exactly did you do, and
in particular did you remember to switch to the master branch and do a
"git pull" in master, before invoking "gitmerge"?