From: Glenn Morris <rgm@gnu.org>
To: emacs-devel@gnu.org
Subject: merge conflict tedium
Date: Mon, 07 Jan 2019 15:00:34 -0500 [thread overview]
Message-ID: <lly37w9r19.fsf@fencepost.gnu.org> (raw)
Hi,
I have set up automatic merging of the emacs-26 branch to master some
time ago. I feel like I quite often have to intervene due to needless
merge conflicts that can't be resolved automatically but could have been
avoided with a little effort.
Today's problems were caused by:
1) 08840f2
Unlabelled backport of a year old commit from master?
Adding an explicit "backport" or "cherry-pick" message to the commit would
have avoided this.
2) 536e6de and 13b586d, and b513feb
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.
End of complaint! :)
next reply other threads:[~2019-01-07 20:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-07 20:00 Glenn Morris [this message]
2019-01-07 20:59 ` merge conflict tedium 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
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=lly37w9r19.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=emacs-devel@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.