Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-21 22:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

docs: update release doc to remove outdate information on patch merges

Browse Source 
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.
This commit is contained in:
Joey Perrott 2020-07-22 14:32:12 -07:00 committed by Alan Agius
parent 4938554490
commit b663471aef
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/process/release.md
View File

@ -42,20 +42,7 @@ When a PR is merged, if the `PR target` label includes a branch other than
`master`, commits will need to be cherry-picked to an associated branch. In `master`, commits will need to be cherry-picked to an associated branch. In
particular, the `patch` target simply refers to the latest patch branch (eg. particular, the `patch` target simply refers to the latest patch branch (eg.
`1.2.x` or `1.3.x-rc.0`). This branch should be updated by cherry-picking all `1.2.x` or `1.3.x-rc.0`). This branch should be updated by cherry-picking all
_applicable_ commits to it, such as those with messages beginning with `fix()`, commits from the PR to it.
`docs()`, or `refactor()`.
Say the following PR is merged;
```text
* fix(@angular/cli): fix path when doing stuff
* refactor(@angular-devkit/core): replace Fizz with Buzz
* feat(@angular-devkit/core): add new feature
* fix(@angular-devkit/core): fix something related to new feature
* refactor(@angular-devkit/core): move stuff to new feature
```
Only the first 2 commits should be cherry picked to the patch branch, as the last 3 are related to a new feature.
Cherry picking is done by checking out the patch branch and cherry picking the new commit onto it. Cherry picking is done by checking out the patch branch and cherry picking the new commit onto it.
The patch branch is simply named as a version number, with a X in the relevant spot, such as `9.0.x`. The patch branch is simply named as a version number, with a X in the relevant spot, such as `9.0.x`.