|
From: | Stefan Monnier |
Subject: | Re: [RFC] Correctly handling MinGW-w64 |
Date: | Tue, 18 Nov 2014 09:50:58 -0500 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
> Just tried. Merging all those Changelogs is insane. No, that's the easy part: M-r does a "good enough" job (tho we like to do it slightly differently). The hard part is to deal with the code conflicts: that's what the "don't merge to trunk" annotations are really about. Especially because some of those "don't merge to trunk" might apply without textual conflict (yet should *not* be included: the conflict is at a more conceptual/semantic level). Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |