|
| From: | Dmitry Gutov |
| Subject: | Re: Freeze is almost here |
| Date: | Fri, 13 Nov 2015 23:46:05 +0200 |
| User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:42.0) Gecko/20100101 Thunderbird/42.0 |
On 11/13/2015 10:17 PM, Eli Zaretskii wrote:
Merging from master to the release branch will likely make a mess when we later merge back the bugfixes.
Like others mentioned, not at all.
Anyway, I already pushed all the cherry-picks (with a special marker that should exempt them from merging back via gitmerge.el).
Yeah, that was premature. John was clearly planning a fast-forward merge from master later today.
On the other hand, I don't know why we needed emacs-25 to be created in advance.
| [Prev in Thread] | Current Thread | [Next in Thread] |