|
From: | Glenn Morris |
Subject: | Re: [RFC] Correctly handling MinGW-w64 |
Date: | Mon, 17 Nov 2014 22:31:04 -0500 |
User-agent: | Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
Óscar Fuentes wrote: >> How about applying to both (with a suitable "don't merge to trunk" >> note on emacs-24)? > > Not sure how to do that on an effective way. Write "do not merge to trunk" in the commit log. (And then wait for someone to implement a bzrmerge.el replacement so that actually does something.) > Pushed the change to emacs-24. Let's see how it fares after the next > merge. Ah yes, the "Somebody Else's Problem" method! :) (The ideal solution would be for you to now merge emacs-24 to trunk and resolve the conflicts yourself.)
[Prev in Thread] | Current Thread | [Next in Thread] |