From: Stefan Kangas <stefankangas@gmail.com>
To: Jim Porter <jporterbugs@gmail.com>, Eli Zaretskii <eliz@gnu.org>
Cc: luangruo@yahoo.com, 71741@debbugs.gnu.org, epg@pretzelnet.org
Subject: bug#71741: 30.0.60; Wrong type argument: number-or-marker-p after C-x C-+ in eww
Date: Mon, 24 Jun 2024 14:56:57 -0700 [thread overview]
Message-ID: <CADwFkmmCoaqPsxUe2zLkLtE_yL+58D-1ygW7zgcHD7c=F14mcw@mail.gmail.com> (raw)
In-Reply-To: <0aa521b4-817a-241c-65d3-6ae11cc9a14d@gmail.com>
Jim Porter <jporterbugs@gmail.com> writes:
> Is the following a good way to merge these?
>
> * Install the first patch to the emacs-30 branch
> * Install both patches to the master branch
> * Push to Savannah
>
> I just want to be sure I don't mess up the automerge.
Push both patches to master and then `git cherry-pick -x <SHA>` the
first one on emacs-30 and push that there.
There should be no issue with the merge that way (though it happens
every so often anyways because of us moving the etc/NEWS file around
between branches).
next prev parent reply other threads:[~2024-06-24 21:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-23 23:13 bug#71741: 30.0.60; Wrong type argument: number-or-marker-p after C-x C-+ in eww epg
2024-06-23 23:24 ` Stefan Kangas
2024-06-24 0:32 ` Jim Porter
2024-06-24 11:58 ` Eli Zaretskii
2024-06-24 12:38 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-06-24 21:04 ` Jim Porter
2024-06-24 21:56 ` Stefan Kangas [this message]
2024-06-25 4:39 ` Jim Porter
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='CADwFkmmCoaqPsxUe2zLkLtE_yL+58D-1ygW7zgcHD7c=F14mcw@mail.gmail.com' \
--to=stefankangas@gmail.com \
--cc=71741@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=epg@pretzelnet.org \
--cc=jporterbugs@gmail.com \
--cc=luangruo@yahoo.com \
/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).