bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#52126: Problematic characters in info node names


From: Stefan Kangas
Subject: bug#52126: Problematic characters in info node names
Date: Mon, 29 Nov 2021 22:39:53 -0800

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.





reply via email to

[Prev in Thread] Current Thread [Next in Thread]