From 6e4ef91ceb50bd2b54ec4140c527b1a5c60bc053 Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Wed, 6 Feb 2019 11:21:16 -0800 Subject: [PATCH] docs: update merge label meaning (#28574) PR Close #28574 --- docs/TRIAGE_AND_LABELS.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/TRIAGE_AND_LABELS.md b/docs/TRIAGE_AND_LABELS.md index dd3a1c5e04..41daeaa34e 100644 --- a/docs/TRIAGE_AND_LABELS.md +++ b/docs/TRIAGE_AND_LABELS.md @@ -126,7 +126,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: @@ -178,4 +178,4 @@ This label can be added to let the caretaker know that the PR needs special atte 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. \ No newline at end of file +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.