[core-workflow] instructions for cherrypicking a change from master

Chris Angelico rosuav at gmail.com
Fri Oct 7 17:37:56 EDT 2016


On Sat, Oct 8, 2016 at 8:31 AM, Maciej Szulik <soltysh at gmail.com> wrote:
> There's one nit with that cherry-pick, it already creates the commit, and
> current
> description states you should create a commit after running tests [1].
>
> [1]
> http://cpython-devguide.readthedocs.io/en/github/committing.html#merging-between-different-branches-within-the-same-major-version

Not sure that that need be a problem. You've already run the tests on
the other branch, presumably, so the chances of a test failure are
low; most of the time, it'll be "cherry-pick, test, push", and very
occasionally, it'll be "cherry-pick, test, oops failures, reset or
amend". As long as you don't push, there's nothing permanent in the
commit.

ChrisA


More information about the core-workflow mailing list