diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0ecb05711b..441d76307c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -102,6 +102,32 @@ Please also see [GitHub workflow](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md#github-workflow) section of general project contributing guide. +### How to Get PRs Merged + +A PR is considered to be **ready to merge** when: + +* 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, 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 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 + 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. +* `README.md` has been updated if necessary. +* Urgent fix can take exception as long as it has been actively + communicated. + +Any Maintainer can merge the PR once it is **ready to merge**. + ## Required Tools Working with the project sources requires the following tools: