On Thu, Jan 24, 2019 at 09:13:32AM +0000, Edward Welbourne wrote: > A cherry-pick takes the diff involved in one commit and patches another > check-out with it. A merge uses the digraph of commits in sophisticated > ways; a cherry-pick does not. > uhhh, actually, it does. cherry-pick even has the --strategy option from merge. compare also git am -3.
it seems plausible that a longer series of cherry-picks to the same area would increasingly defeat the merge logic. while at it, i'll also note that last time i checked git was somewhat weak for a cherry-picking workflow compared to subversion and a bunch of other VCSs aimed at exclusively linear histories, because it doesn't record where commits were picked _to_ (though that would be actually implementable on top of notes). _______________________________________________ Development mailing list Development@qt-project.org https://lists.qt-project.org/listinfo/development
