diff --git a/bazel-out b/bazel-out new file mode 120000 index 0000000000..50952779ae --- /dev/null +++ b/bazel-out @@ -0,0 +1 @@ +/private/var/tmp/_bazel_misko/1126e726ab9a0d0ed3e2392a7bbe5a3c/execroot/angular/bazel-out \ No newline at end of file diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md index 54c18bf559..e43d508d20 100644 --- a/docs/TRIAGE_AND_LABELS.md +++ b/docs/TRIAGE_AND_LABELS.md @@ -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: ` + +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.