Update cherry-picks.md

This commit is contained in:
Joe Betz 2017-10-10 13:45:14 -07:00 committed by GitHub
parent 29c7f6cbe1
commit 6b5ed4cd95
1 changed files with 1 additions and 1 deletions

View File

@ -9,7 +9,7 @@ depending on the point in the release cycle.
1. Cherrypicks are [managed with labels and milestones](pull-requests.md#write-release-notes-if-needed) 1. Cherrypicks are [managed with labels and milestones](pull-requests.md#write-release-notes-if-needed)
1. To get a PR merged to the release branch, first ensure the following labels 1. To get a PR merged to the release branch, first ensure the following labels
are on the original **master** branch PR: are on the original **master** branch PR:
* The `milestone` for the branch that you want to cherry-pick to (e.g. v1.7 if you want to backport your change in 1.7 branch) * The milestone for the branch that you want to cherry-pick to (e.g. v1.7 if you want to backport your change in 1.7 branch)
* The `cherrypick-candidate` label * The `cherrypick-candidate` label
1. If `release-note-none` is set on the master PR, the cherrypick PR will need 1. If `release-note-none` is set on the master PR, the cherrypick PR will need
to set the same label to confirm that no release note is needed. to set the same label to confirm that no release note is needed.