From 29c7f6cbe15bc9246cccda8be049667b8de40334 Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 10 Oct 2017 10:41:45 -0700 Subject: Clarify how milestone should be set for cherrypicks --- contributors/devel/cherry-picks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/devel/cherry-picks.md b/contributors/devel/cherry-picks.md index 43b32bdb..e1f60789 100644 --- a/contributors/devel/cherry-picks.md +++ b/contributors/devel/cherry-picks.md @@ -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. To get a PR merged to the release branch, first ensure the following labels are on the original **master** branch PR: - * An appropriate milestone (e.g. v1.3) + * 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 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. -- cgit v1.2.3 From 6b5ed4cd953aeb0eecd8f30dfe9119c79e6886ec Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 10 Oct 2017 13:45:14 -0700 Subject: Update cherry-picks.md --- contributors/devel/cherry-picks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/devel/cherry-picks.md b/contributors/devel/cherry-picks.md index e1f60789..c503476e 100644 --- a/contributors/devel/cherry-picks.md +++ b/contributors/devel/cherry-picks.md @@ -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. To get a PR merged to the release branch, first ensure the following labels 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 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. -- cgit v1.2.3