That's one way to go about it. To elaborate: Add "Cherry-picks: not for 2.x" in the original patch that goes into 'master', manually cherry-pick to '2.x', resolve conflicts and push. However, this way, if there are multiple patches being merged, we could end up with a different order of commits in '2.x' than in 'master'.
Another way would be to anticipate this failure, let GVO for that patch complete in master, and do the manual cherry-pick+resolve+push after. This way, the order of commits in '2.x' would match the order of commits in 'master'. On Thu, May 3, 2018 at 12:16 PM, Jim Apple <[email protected]> wrote: > > > > To avoid these types of failures, I advise authors to locally cherry pick > > their patch to '2.x' to see if it applies cleanly before running GVO. > > > > And thus commit to 2.x a patch that has not passed GVO? > > Just making sure I understand the framework. >
