From a787f09536357d91c64f253e140d55a980115799 Mon Sep 17 00:00:00 2001 From: Anthony Mirabella Date: Thu, 10 Sep 2020 14:42:49 -0400 Subject: [PATCH] Update CONTRIBUTING.md to reflect PR process-as-applied (#1159) --- CONTRIBUTING.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 98d1d177ac9..abd15f5b03d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -97,19 +97,20 @@ request ID to the entry you added to `CHANGELOG.md`. A PR is considered to be **ready to merge** when: * It has received two approvals from Collaborators/Maintainers (at - different companies). + 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. * Major feedbacks are resolved. * It has been open for review for at least one working day. This gives people reasonable time to review. -* Trivial change (typo, cosmetic, doc, etc.) doesn't have to wait for - one day. +* Trivial changes (typo, cosmetic, doc, etc.) do not have to wait for + one day and may be merged with a single Maintainer's approval. * `CHANGELOG.md` has been updated to reflect what has been added, changed, removed, or fixed. * Urgent fix can take exception as long as it has been actively communicated. -Any Collaborator/Maintainer can merge the PR once it is **ready to -merge**. +Any Maintainer can merge the PR once it is **ready to merge**. ## Design Choices