From: Glenn Morris <rgm@gnu.org>
To: Paul Eggert <eggert@cs.ucla.edu>
Cc: Michael Albinus <michael.albinus@gmx.de>, emacs-devel@gnu.org
Subject: Re: merge conflict tedium
Date: Thu, 10 Jan 2019 20:05:03 -0500 [thread overview]
Message-ID: <hca7k857i8.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <c37e099b-5aa1-b3ec-47f1-d8ebb00f41ba@cs.ucla.edu> (Paul Eggert's message of "Mon, 7 Jan 2019 16:57:41 -0800")
Paul Eggert wrote:
> I've made that mistake myself, and the simplest fix I thought of was
> to immediately merge the emacs-26 branch myself to master, making sure
> that I handle the mistake correctly during the merge.
I think that's the best solution.
None of this is a big deal! :)
prev parent reply other threads:[~2019-01-11 1:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 20:00 merge conflict tedium Glenn Morris
2019-01-07 20:59 ` Michael Albinus
2019-01-07 21:10 ` Michael Albinus
2019-01-11 1:06 ` Glenn Morris
2019-01-14 16:39 ` Michael Albinus
2019-01-08 0:57 ` Paul Eggert
2019-01-11 1:05 ` Glenn Morris [this message]
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=hca7k857i8.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=michael.albinus@gmx.de \
/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.