Skip to content

Commit 454926a

Browse files
authored
Flutter-Cherrypick-Process.md - Spell cherry-pick consistently (flutter#172697)
1 parent a738ae5 commit 454926a

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

docs/releases/Flutter-Cherrypick-Process.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
## Goal
44

5-
With branching and branch testability being supported for Flutter & Dart releases, cherry-picking fixes is the preferred method to address issues for released software (beta and stable channels.) Stability of the release will be the overarching goal, so only highly impactful and critical cherrypicks will be allowed across Dart and Flutter. This document outlines the process for requesting and approval of cherrypicks.
5+
With branching and branch testability being supported for Flutter & Dart releases, cherry-picking fixes is the preferred method to address issues for released software (beta and stable channels). Stability of the release will be the overarching goal, so only highly impactful and critical cherry-picks will be allowed across Dart and Flutter. This document outlines the process for requesting and approval of cherry-picks.
66

77
**Note: This process applies to regressions from the previous release or serious bugs otherwise introduced by the current release. Feature work is not considered for cherry-picking and will need to wait for the next release.**
88

99
## Automatically Create a Cherry-pick Request
1010

1111
1. Add the `cp: beta` or `cp: stable` label to the pull request on flutter/flutter master. (you can find [beta](https://github.com/flutter/flutter/blob/beta/bin/internal/release-candidate-branch.version) and [stable](https://github.com/flutter/flutter/blob/stable/bin/internal/release-candidate-branch.version) candidate branch info by following the respective links)
1212
2. Wait about 30 seconds.
13-
3. If automatic cherry pick succeeds (no merge conflict), a new pull requested will be created and you will receive an email. Edit the cherry-pick details in the PR description of the generated pull request, and a release engineer will follow up on the request.
14-
4. If automatic cherry pick fails, a comment will be left on the original PR. In this case you will need to follow instructions in the manual cherry-pick section below to manually create a cherry pick PR.
13+
3. If automatic cherry-pick succeeds (no merge conflict), a new pull requested will be created and you will receive an email. Edit the cherry-pick details in the PR description of the generated pull request, and a release engineer will follow up on the request.
14+
4. If automatic cherry-pick fails, a comment will be left on the original PR. In this case you will need to follow instructions in the manual cherry-pick section below to manually create a cherry-pick PR.
1515

1616
If for some reason, an automated cherry-pick can not be applied, please follow the manual cherry-pick instructions.
1717

@@ -35,7 +35,7 @@ If the automated cherry-pick process fails, you will have to create the cherry-p
3535

3636
Anyone can request a cherry-pick.
3737

38-
### When do I request a cherry pick?
38+
### When do I request a cherry-pick?
3939

4040
- Whenever you have identified a commit on the main/master that fixes an issue that is present on the beta or stable branch.
4141
- Whenever you need to update a pub dependency that fixes an issue that is present on the beta or stable branch (see [Updating dependencies](../infra/Updating-dependencies-in-Flutter.md#to-update-a-single-dependency-for-cherrypicks)

0 commit comments

Comments
 (0)