[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: master 2d7f4d9 12/15: ; Merge from origin/emacs-25
|
From: |
John Wiegley |
|
Subject: |
Re: master 2d7f4d9 12/15: ; Merge from origin/emacs-25 |
|
Date: |
Tue, 12 Jan 2016 08:23:17 -0800 |
|
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) |
>>>>> Eli Zaretskii <address@hidden> 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