From: Stefan Kangas <stefan@marxist.se>
To: Glenn Morris <rgm@gnu.org>
Cc: Emacs developers <emacs-devel@gnu.org>
Subject: Re: Merge conflicts
Date: Mon, 4 Oct 2021 17:26:49 +0200 [thread overview]
Message-ID: <CADwFkmkr7wwHMygvfuZeS9TeO5NM3riDbV4yqvTwebmrdyvarw@mail.gmail.com> (raw)
In-Reply-To: <4lr1d0rf16.fsf@fencepost.gnu.org>
Glenn Morris <rgm@gnu.org> writes:
> The emacs-28 branch is already accruing merge conflicts against master,
> which is a bit depressing. Please think about these things if you are
> changing the same file on both branches. Eg remember to write
> "do not merge to master" in the log when appropriate (ef6c43b896?).
Thank you for the reminder, and many thanks for doing these merges.
next prev parent reply other threads:[~2021-10-04 15:26 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
2021-10-04 15:26 ` Stefan Kangas [this message]
-- 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
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=CADwFkmkr7wwHMygvfuZeS9TeO5NM3riDbV4yqvTwebmrdyvarw@mail.gmail.com \
--to=stefan@marxist.se \
--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 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).