Re: Merging emacs-25 into master

[Stefan Monnier]

>> 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?

Sorry, nothing very specific.  I remember a minor issue in the undo
code, but there were more worrying problems elsewhere that
I can't remember.

> 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.

Weekly sounds good.  It can even be slightly longer, but after a while
it gets more difficult to let the author of the problematic code deal
with the conflicts (which is usually the simplest option).


        Stefan