From: Michael Albinus <michael.albinus@gmx.de>
To: Glenn Morris <rgm@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: merge conflict tedium
Date: Mon, 07 Jan 2019 22:10:59 +0100 [thread overview]
Message-ID: <87bm4sgom4.fsf@gmx.de> (raw)
In-Reply-To: <87ftu4gp4z.fsf@gmx.de> (Michael Albinus's message of "Mon, 07 Jan 2019 21:59:40 +0100")
Michael Albinus <michael.albinus@gmx.de> writes:
Hi Glenn,
> Do we have any other mean, to handle such situations? The current
> workflow requires to add the proper wording during commit. I cannot
> promise this will always work, so some more robust approach would be
> welcome.
Maybe it is possible, to ask in the *release-branch*, whether this
shall be merged to master. Interactively, when committing. This sole
question would be sufficient, at least for me.
Best regards, Michael.
next prev parent reply other threads:[~2019-01-07 21:10 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 [this message]
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
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=87bm4sgom4.fsf@gmx.de \
--to=michael.albinus@gmx.de \
--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.