diff options
| author | David McMahon <djmm@google.com> | 2016-05-02 17:35:10 -0700 |
|---|---|---|
| committer | David McMahon <djmm@google.com> | 2016-05-09 10:19:19 -0700 |
| commit | 182a990c16bb9ca1450313b9b250fe657dc8e747 (patch) | |
| tree | b9cb64905e363878dd9f396579cb8e718de2b4e3 | |
| parent | 13977a3612956ba155a91f43f3f03adfe7a883e8 (diff) | |
Update pull request and cherrypick docs for release notes to more accurately reflect current process.
| -rw-r--r-- | cherry-picks.md | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cherry-picks.md b/cherry-picks.md index 81b8cd47..d5456a1a 100644 --- a/cherry-picks.md +++ b/cherry-picks.md @@ -42,14 +42,12 @@ depending on the point in the release cycle. 1. Cherrypicks are [managed with labels and milestones] (pull-requests.md#release-notes) -1. All label/milestone accounting happens on PRs on master. There's nothing to -do on PRs targeted to the release branches. -1. When you want a PR to be merged to the release branch, make the following -label changes to the **master** branch PR: - * Remove release-note-label-needed - * Add an appropriate release-note-(!label-needed) label - * Add an appropriate milestone - * Add the `cherrypick-candidate` label +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 `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. 1. `release-note` labeled PRs generate a release note using the PR title by default OR the release-note block in the PR template if filled in. * See the [PR template](../../.github/PULL_REQUEST_TEMPLATE.md) for more |