From: Stefan Kangas <stefan@marxist.se>
To: Eli Zaretskii <eliz@gnu.org>, Protesilaos Stavrou <info@protesilaos.com>
Cc: 52126@debbugs.gnu.org, larsi@gnus.org, kyle@kyleam.com, rgm@gnu.org
Subject: bug#52126: Problematic characters in info node names
Date: Mon, 29 Nov 2021 22:39:53 -0800 [thread overview]
Message-ID: <CADwFkmnL0XrY4571BYhofTvSbQXu5rtCR8Zn+GXeRhCKkypEFw@mail.gmail.com> (raw)
In-Reply-To: <8335neuxyr.fsf@gnu.org>
Eli Zaretskii <eliz@gnu.org> writes:
> The common part should only be committed to one branch.
> Alternatively, the commit to emacs-28 should be marked with the "do
> not merge to master" note. See CONTRIBUTE for more about this.
Yup.
Otherwise, I get to resolve merge conflicts over my morning coffee. :-)
There are unresolved conflicts in .../emacs/doc/misc/modus-themes.org
Conflicts in:
doc/misc/modus-themes.org
Resolve the conflicts manually
automerge: merge error
It's not the end of the world, but it saves time if we can avoid it.
next prev parent reply other threads:[~2021-11-30 6:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 15:24 bug#52126: Problematic characters in info node names Stefan Kangas
2021-11-26 16:26 ` Eli Zaretskii
2021-11-29 16:03 ` Lars Ingebrigtsen
2021-11-29 17:44 ` Stefan Kangas
2021-11-29 17:52 ` Eli Zaretskii
2021-11-29 18:04 ` Protesilaos Stavrou
2021-11-29 18:07 ` Eli Zaretskii
2021-11-29 19:32 ` Protesilaos Stavrou
2021-11-29 19:46 ` Eli Zaretskii
2021-11-29 20:07 ` Protesilaos Stavrou
2021-11-29 20:32 ` Eli Zaretskii
2021-11-29 20:56 ` Protesilaos Stavrou
2021-11-30 3:25 ` Eli Zaretskii
2021-11-30 6:39 ` Stefan Kangas [this message]
2021-11-30 7:16 ` Protesilaos Stavrou
2021-11-30 7:41 ` Stefan Kangas
2021-11-30 16:48 ` Eli Zaretskii
2021-11-29 18:31 ` Stefan Kangas
2021-11-29 18:17 ` Glenn Morris
2021-11-30 4:31 ` Kyle Meyer
2021-11-30 4:39 ` Kyle Meyer
2021-12-03 1:12 ` Stefan Kangas
2021-12-03 1:45 ` Kyle Meyer
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=CADwFkmnL0XrY4571BYhofTvSbQXu5rtCR8Zn+GXeRhCKkypEFw@mail.gmail.com \
--to=stefan@marxist.se \
--cc=52126@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=info@protesilaos.com \
--cc=kyle@kyleam.com \
--cc=larsi@gnus.org \
--cc=rgm@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).