From: Lars Ingebrigtsen <larsi@gnus.org>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merge conflicts
Date: Mon, 04 Oct 2021 17:24:52 +0200 [thread overview]
Message-ID: <878rz8dd8b.fsf@gnus.org> (raw)
In-Reply-To: <4lr1d0rf16.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 04 Oct 2021 11:22:13 -0400")
Glenn Morris <rgm@gnu.org> writes:
> Eg remember to write "do not merge to master" in the log when
> appropriate (ef6c43b896?).
Oops; sorry.
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2021-10-04 15:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-04 15:22 Merge conflicts Glenn Morris
2021-10-04 15:24 ` Lars Ingebrigtsen [this message]
2021-10-04 15:26 ` Stefan Kangas
-- strict thread matches above, loose matches on Subject: below --
2020-08-31 17:18 Glenn Morris
2020-08-31 17:28 ` Michael Albinus
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878rz8dd8b.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=emacs-devel@gnu.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.