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 21:59:40 +0100 [thread overview]
Message-ID: <87ftu4gp4z.fsf@gmx.de> (raw)
In-Reply-To: <lly37w9r19.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 07 Jan 2019 15:00:34 -0500")
Glenn Morris <rgm@gnu.org> writes:
> Hi,
Hi Glenn,
> Today's problems were caused by:
> 1) 08840f2
> 2) 536e6de and 13b586d, and b513feb
All of these commits are mine, and I'm very sorry for that. It happens
again and again that I forget the "don't merge" idiom in the commit
message, and even if I recognize it after the commit (it happens), I
don't know how to add it after a push. Is there something I could do?
> Conceptually the same commit (?), but made on different branches without
> any indication, coupled with a simultaneous reformat on master. Changing
> the same code on multiple branches at the same time is a PITA. Please
> merge it yourself if doing that.
It is not intended to be merged. After the crewation of Emacs 26.1.91,
I've seen on emba, that the code I've resolved in the morning in the
master branch, needed to be adapted also in the emacs-26 branch. A
cherry pick wasn't possible, so the looks-like-identical merge. Again, I
forgot to say "don't merge".
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.
> End of complaint! :)
You have all rights to complain! I'm very sorry about.
Best regards, Michael.
next prev parent reply other threads:[~2019-01-07 20:59 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 [this message]
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
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=87ftu4gp4z.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.