From 58ca33dc075cbcce101e9df46344603097dd7daa Mon Sep 17 00:00:00 2001 From: Anthony J Mirabella Date: Mon, 3 Jan 2022 20:10:19 -0500 Subject: [PATCH] Address PR feedback Signed-off-by: Anthony J Mirabella --- CONTRIBUTING.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dfa1ce5e907..441d76307c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -106,17 +106,16 @@ section of general project contributing guide. A PR is considered to be **ready to merge** when: -* It has received two approvals from Collaborators/Maintainers (at - different companies). This is not enforced through technical means - and a PR may be **ready to merge** with a single approval if the change - and its approach have been discussed and consensus reached. +* Either of the following are true: + * The PR has received at least two approvals from Collaborators/Maintainers with different employers. + * The PR has received a single approval from a Maintainer *and* there's a pointer to a public discussion where at least two Collaborators/Maintainers with different employers have agreed upon the approach taken. * Feedback has been addressed. * Any substantive changes to your PR will require that you clear any prior - Approval reviews, this includes changes resulting from other feedback. Unless + Approval reviews, including changes resulting from other feedback. Unless the approver explicitly stated that their approval will persist across changes it should be assumed that the PR needs their review again. Other project members (e.g. approvers, maintainers) can help with this if there are - any questions or if you forget to clear reviews. + any questions or if the PR author forgot to clear reviews. * It has been open for review for at least one working day. This gives people reasonable time to review. * Trivial changes (typo, cosmetic, doc, etc.) do not have to wait for