docs: update merge label meaning (#28574)

PR Close #28574
This commit is contained in:
Alex Eagle 2019-02-06 11:21:16 -08:00 committed by Miško Hevery
parent 4ddf57c58d
commit c4c0e9dbc5
2 changed files with 9 additions and 1 deletions

1
bazel-out Symbolic link
View File

@ -0,0 +1 @@
/private/var/tmp/_bazel_misko/1126e726ab9a0d0ed3e2392a7bbe5a3c/execroot/angular/bazel-out

View File

@ -115,7 +115,7 @@ Every triaged PR must have a `pr_action` label assigned to it:
* `PR action: review` - work is complete and comment is needed from the reviewers.
* `PR action: cleanup` - more work is needed from the author.
* `PR action: discuss` - discussion is needed, to be led by the author.
* `PR action: merge` - the PR is ready to be merged by the caretaker.
* `PR action: merge` - the PR author is ready for the changes to be merged by the caretaker.
In addition, PRs can have the following states:
@ -161,3 +161,10 @@ Only issues with `cla:yes` should be merged into master.
### `aio: preview`
Applying this label to a PR makes the angular.io preview available regardless of the author. [More info](../aio/aio-builds-setup/docs/overview--security-model.md)
### `PR action: merge-assistance`
This label can be added to let the caretaker know that the PR needs special attention.
There should always be a comment added to the PR to explain why the caretaker's assistance is needed.
The comment should be formatted like this: `merge-assistance: <explain what kind of assistance you need, and if not obvious why>`
For example, the PR owner might not be a Googler and needs help to run g3sync; or one of the checks is failing due to external causes and the PR should still be merged.