From e0f3fd72dddbd54c33e2e485584fc68ce965840e Mon Sep 17 00:00:00 2001 From: Kara Erickson Date: Tue, 19 Feb 2019 11:55:59 -0800 Subject: [PATCH] docs: clarify process surrounding merge label (#28837) In the TRIAGE_AND_LABELS doc, it was not clear that the merge label may be applied by the author before the PR is green (as a sort of auto-submit). After the label is applied, it is still up to the caretaker to determine that the PR is acceptable before merging. This commit adds that clarification. PR Close #28837 --- docs/TRIAGE_AND_LABELS.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md index 41daeaa34e..95889ffb4f 100644 --- a/docs/TRIAGE_AND_LABELS.md +++ b/docs/TRIAGE_AND_LABELS.md @@ -126,7 +126,8 @@ 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 author is ready for the changes to be merged by the caretaker. +* `PR action: merge` - the PR author is ready for the changes to be merged by the caretaker as soon as the PR is green (or merge-assistance label is applied and caretaker has deemed it acceptable manually). In other words, this label indicates to "auto submit when ready". + In addition, PRs can have the following states: