Skip to content

Commit

Permalink
Update CONTRIBUTING.md to reflect PR process-as-applied (#1159)
Browse files Browse the repository at this point in the history
  • Loading branch information
Aneurysm9 authored Sep 10, 2020
1 parent 36c323f commit a787f09
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a787f09

Please sign in to comment.