[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging emacs-25 into master
From: |
John Wiegley |
Subject: |
Re: Merging emacs-25 into master |
Date: |
Mon, 28 Dec 2015 12:10:11 -0800 |
User-agent: |
Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) |
>>>>> Stefan Monnier <address@hidden> writes:
> I just tried to merge from emacs-25 to master, via gitmerge.el. Just to let
> you know that this sucked, and after fixing a few obvious problems by hand
> and finally bumping into assertion errors, I simply gave up in disgust.
Thanks for the attempt, Stefan. Any notes you can send me for when I pick up
the baton?
These merges should happen no less often than weekly, so I'm going to do my
first one tomorrow, and then establish a regular schedule after that.
--
John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2
signature.asc
Description: PGP signature