Subject: Re: bug#52126: Problematic characters in info node names

From: Stefan Kangas <[email-masked]>
Date: Mon, 29 Nov 2021 22:39:53 -0800

Eli Zaretskii <[email-masked]> 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.