From 4099822ba29a2b59e289d76f81ff695ef9ae9b59 Mon Sep 17 00:00:00 2001 From: Michael Prentice Date: Sun, 20 Oct 2019 13:53:10 -0400 Subject: [PATCH] docs: fix and refine COMMITTER.md (#33276) mention correct merge label remove the non inclusive "**just** read the instructions" content link to CODEOWNERS file PR Close #33276 --- docs/COMMITTER.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/COMMITTER.md b/docs/COMMITTER.md index be4aa8d616..1ac3a5c8d6 100644 --- a/docs/COMMITTER.md +++ b/docs/COMMITTER.md @@ -1,20 +1,19 @@ # Pushing changes into the Angular tree Please see [Using git with Angular repositories](https://docs.google.com/document/d/1h8nijFSaa1jG_UE8v4WP7glh5qOUXnYtAtJh_gwOQHI/edit) -for details about how we maintain a linear commit history, and the rules for committing. +for details about how we maintain a linear commit history and the rules for committing. -As a contributor, just read the instructions in [CONTRIBUTING.md](../CONTRIBUTING.md) and send a pull request. -Someone with committer access will do the rest. +As a contributor, see the instructions in [CONTRIBUTING.md](../CONTRIBUTING.md). # Change approvals -Change approvals in our monorepo are managed via [GitHub CODEOWNERS](https://help.github.com/articles/about-codeowners/) and are configured via the `.github/CODEOWNERS` file. - +Change approvals in our monorepo are managed via [GitHub CODEOWNERS](https://help.github.com/articles/about-codeowners/) and are configured via the [`.github/CODEOWNERS`](../.github/CODEOWNERS) file. # Merging -Once a change has all the approvals either the last approver or the PR author (if PR author has the project collaborator status) should mark the PR with `PR: merge` as well as `PR target: *` labels. -This signals to the caretaker that the PR should be merged. See [merge instructions](../CARETAKER.md). +Once a change has all of the required approvals, either the last approver or the PR author (if PR author has the project collaborator status) +should mark the PR with the `PR action: merge` label and the correct [target label](https://github.com/angular/angular/blob/master/docs/TRIAGE_AND_LABELS.md#pr-target). +This signals to the caretaker that the PR should be merged. See [merge instructions](CARETAKER.md). # Who is the Caretaker?