unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: Andrea Corallo <akrl@sdf.org>
Cc: dieter@duenenhof-wilhelm.de, corwin@bru.st, emacs-devel@gnu.org
Subject: Re: [External] : emacs-28 windows binaries available from alpha
Date: Thu, 10 Feb 2022 19:15:18 +0200	[thread overview]
Message-ID: <83ee4atzh5.fsf@gnu.org> (raw)
In-Reply-To: <xjf35kqu9md.fsf@ma.sdf.org> (message from Andrea Corallo on Thu,  10 Feb 2022 13:36:10 +0000)

> 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"?



  reply	other threads:[~2022-02-10 17:15 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-04 18:54 emacs-28 windows binaries available from alpha Corwin Brust
2022-02-04 22:08 ` [External] : " Drew Adams
2022-02-04 22:12   ` Drew Adams
2022-02-04 23:10     ` Corwin Brust
2022-02-05  1:28       ` Drew Adams
2022-02-05  4:35         ` Corwin Brust
2022-02-05  7:43           ` Eli Zaretskii
2022-02-05  8:48             ` Corwin Brust
2022-02-05  9:15               ` Eli Zaretskii
2022-02-05 18:16           ` Drew Adams
2022-02-05  7:25     ` Eli Zaretskii
2022-02-05  9:22       ` H. Dieter Wilhelm
2022-02-05  9:40         ` Eli Zaretskii
2022-02-05 16:49           ` H. Dieter Wilhelm
2022-02-05 17:54             ` Eli Zaretskii
2022-02-05 19:25               ` H. Dieter Wilhelm
2022-02-05 19:47                 ` Eli Zaretskii
2022-02-05 21:11                   ` H. Dieter Wilhelm
2022-02-05 22:56                     ` Corwin Brust
2022-02-06  0:10                       ` Drew Adams
2022-02-06  8:22                         ` Eli Zaretskii
2022-02-06  8:51                           ` Drew Adams
2022-02-06  9:25                             ` Eli Zaretskii
2022-02-06 17:08                               ` Drew Adams
2022-02-06 17:33                                 ` Eli Zaretskii
2022-02-06  8:18                       ` Eli Zaretskii
2022-02-05 10:10       ` Eli Zaretskii
2022-02-06  3:11         ` Corwin Brust
2022-02-06  6:57           ` Drew Adams
2022-02-06  9:11             ` Eli Zaretskii
2022-02-06 17:07               ` Drew Adams
2022-02-09 19:08         ` Eli Zaretskii
2022-02-09 21:03           ` Andrea Corallo
2022-02-10  5:52             ` Eli Zaretskii
2022-02-10  8:56               ` Andrea Corallo
2022-02-10 12:13                 ` Eli Zaretskii
2022-02-10 13:36                   ` Andrea Corallo
2022-02-10 17:15                     ` Eli Zaretskii [this message]
2022-02-10 18:34                       ` Andrea Corallo
2022-02-11  8:29                         ` Eli Zaretskii
2022-02-11  9:16                           ` Andrea Corallo
2022-02-11  9:21                             ` Andrea Corallo
2022-02-11 11:31                               ` Eli Zaretskii
2022-02-11 14:16                                 ` Andrea Corallo
2022-02-11 14:33                                   ` Eli Zaretskii
2022-02-11 14:38                                     ` Andrea Corallo
2022-02-11 11:30                             ` Eli Zaretskii
2022-02-11 14:18                               ` Andrea Corallo
2022-02-11 14:35                                 ` Eli Zaretskii
2022-02-11 14:44                                   ` Andrea Corallo
2022-02-11 15:16                                     ` Eli Zaretskii
2022-02-14 10:25                                       ` Andrea Corallo
2022-02-10 22:50                     ` Corwin Brust
2022-02-06  0:33     ` Corwin Brust

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=83ee4atzh5.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=akrl@sdf.org \
    --cc=corwin@bru.st \
    --cc=dieter@duenenhof-wilhelm.de \
    --cc=emacs-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).