Re: When do we merge the commits from emacs-25 onto master?

[David Engster]

Artur Malabarba writes:
> Thanks Paul and Eli.
>
>> Yes. And you're welcome to do it. We're better off if more people know how to
> do it. Please see admin/notes/git-workflow. It needs updating (at least to
> change "emacs-24" to "emacs-25"), and you can do that before merging....
>
> Would someone kindly do that for me this time? :-)

We still haven't figured out how to deal with the generated ChangeLogs,
so I'm not sure we should merge at the moment.

-David