Skip to content

Commit 7b1109f

Browse files
josephperrottalan-agius4
authored andcommitted
docs: update release doc to remove outdate information on patch merges
Previously instructions for merging to patch instructed caretakers to only merge commits which were "applicable" to patch. However, for PRs targeting master and patch, all commits from the PR should land in both branches. (cherry picked from commit b663471)
1 parent 19fa192 commit 7b1109f

File tree

1 file changed

+1
-14
lines changed

1 file changed

+1
-14
lines changed

docs/process/release.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,7 @@ When a PR is merged, if the `PR target` label includes a branch other than
4242
`master`, commits will need to be cherry-picked to an associated branch. In
4343
particular, the `patch` target simply refers to the latest patch branch (eg.
4444
`1.2.x` or `1.3.x-rc.0`). This branch should be updated by cherry-picking all
45-
_applicable_ commits to it, such as those with messages beginning with `fix()`,
46-
`docs()`, or `refactor()`.
47-
48-
Say the following PR is merged;
49-
50-
```text
51-
* fix(@angular/cli): fix path when doing stuff
52-
* refactor(@angular-devkit/core): replace Fizz with Buzz
53-
* feat(@angular-devkit/core): add new feature
54-
* fix(@angular-devkit/core): fix something related to new feature
55-
* refactor(@angular-devkit/core): move stuff to new feature
56-
```
57-
58-
Only the first 2 commits should be cherry picked to the patch branch, as the last 3 are related to a new feature.
45+
commits from the PR to it.
5946

6047
Cherry picking is done by checking out the patch branch and cherry picking the new commit onto it.
6148
The patch branch is simply named as a version number, with a X in the relevant spot, such as `9.0.x`.

0 commit comments

Comments
 (0)