July 18, 2014
4:13 p.m.
19.07.2014 02:10, Pauli Virtanen kirjoitti:
19.07.2014 01:49, Nathaniel Smith kirjoitti:
On Fri, Jul 18, 2014 at 11:44 PM, Pauli Virtanen <pav@iki.fi> wrote: [clip] Presumably all the commits that we miss on the first pass and end up backporting the hard way later :-)
If those are just cherry-picked, they will generate merge conflicts the next time things are merged back (or, the merge will be smart enough to note the patch was already applied some time ago). This is then probably not really a big problem.
NB. this is a bit playing devil's advocate --- I'm not advocating porting bugfixes from merge branches, as using the merge base should also work fine.