From d0bf0f9c00c310e9e24fe245c1effacf1fc426ec Mon Sep 17 00:00:00 2001 From: Mary Marchini Date: Wed, 5 Aug 2020 16:54:02 -0700 Subject: [PATCH] doc: harden policy around objections Harden policy around objections to avoid misunderstanding and to encourage collaboration between pull request authors and objectors. Fixes: https://github.com/nodejs/node/issues/34564 PR-URL: https://github.com/nodejs/node/pull/34639 Reviewed-By: Anna Henningsen Reviewed-By: Richard Lau Reviewed-By: James M Snell Reviewed-By: Gireesh Punathil Reviewed-By: Joyee Cheung Reviewed-By: Rich Trott --- doc/guides/collaborator-guide.md | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/doc/guides/collaborator-guide.md b/doc/guides/collaborator-guide.md index fb03df4740bd20..e95de0a827c504 100644 --- a/doc/guides/collaborator-guide.md +++ b/doc/guides/collaborator-guide.md @@ -120,14 +120,22 @@ needed [approvals](#code-reviews), [CI](#testing-and-ci), and except the [wait time](#waiting-for-approvals), please add the [`author ready`](#author-ready-pull-requests) label. -Where there is disagreement among Collaborators, consensus should be sought if -possible. If reaching consensus is not possible, a Collaborator may escalate the -issue to the TSC. - -Collaborators should not block a pull request without providing a reason. -Another Collaborator may ask an objecting Collaborator to explain their -objection. If the objector is unresponsive, another Collaborator may dismiss the -objection. +If a collaborator believes a pull request should not land as is, **the "Request +Changes" GitHub feature must be used to make the objection explicit**. An +implicit objection not using the "Request Changes" feature is not a +blocker for a pull request. Pull requests with an explicit objection should +not land until all objections are satisfied. Collaborators should not block a +pull request without providing a reason. **Providing a set of actionable steps +alongside the objection is recommended, and the objector must be willing to +work with the pull request author to reach a consensus about the direction of +the pull request**. If reaching consensus is not possible, a Collaborator may +escalate the issue to the TSC. + +If the objection is not clear to others, another Collaborator may ask an +objecting Collaborator to explain their objection or to provide actionable +steps to resolve the objection. **If the objector is unresponsive for seven +days after a collaborator asks for clarification, another Collaborator may +dismiss the objection**. [Breaking changes](#breaking-changes) must receive [TSC review](#involving-the-tsc). If two TSC members approve the pull request