From: John Wiegley <jwiegley@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Michael Albinus <michael.albinus@gmx.de>, emacs-devel@gnu.org
Subject: Re: master 2d7f4d9 12/15: ; Merge from origin/emacs-25
Date: Tue, 12 Jan 2016 08:23:17 -0800 [thread overview]
Message-ID: <m2fuy2sr62.fsf@newartisans.com> (raw)
In-Reply-To: <83h9iikda2.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 12 Jan 2016 17:50:29 +0200")
>>>>> Eli Zaretskii <eliz@gnu.org> writes:
> John, why were those skipped? Did you bump into prblems trying to merge
> them? Does gitmerge.el need some work?
I did run into a conflict, where master had deleted a Makefile target, and
emacs-25 had added a target. I had thought incorrectly that master was right.
This will continue to be a danger while I'm still not as familiar with the
code as I need to be to know the right resolutions. What I can do is consult
first with the commit authors when I run into conflicts that are not obvious.
> It's not a catastrophe to have to make several merges by hand, but I think
> we should in general avoid that, as doing too many of those is error-prone.
That should be the only misfire on this merge. The other changes were simpler,
and there were few conflicts.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
next prev parent reply other threads:[~2016-01-12 16:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20160112070839.6841.77764@vcs.savannah.gnu.org>
[not found] ` <E1aIt4Y-0001pf-Ns@vcs.savannah.gnu.org>
2016-01-12 9:48 ` master 2d7f4d9 12/15: ; Merge from origin/emacs-25 Michael Albinus
2016-01-12 15:50 ` Eli Zaretskii
2016-01-12 16:23 ` John Wiegley [this message]
[not found] ` <E1aIt4W-0001p0-Om@vcs.savannah.gnu.org>
2016-01-12 16:50 ` master 70f3e4e 08/15: " Glenn Morris
2016-01-12 17:03 ` John Wiegley
2016-01-12 17:09 ` Glenn Morris
2016-01-12 17:12 ` John Wiegley
2016-01-18 18:26 ` Glenn Morris
2016-01-18 19:27 ` Paul Eggert
2016-01-18 21:42 ` John Wiegley
2016-01-12 17:11 ` John Wiegley
2016-01-12 17:32 ` Paul Eggert
2016-01-14 23:15 ` Phillip Lord
2016-01-19 7:38 ` John Wiegley
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=m2fuy2sr62.fsf@newartisans.com \
--to=jwiegley@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=johnw@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.