From 982c34a94aaaa4f38d9e4c65721c36bcc3a2ab10 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 2 Dec 2020 21:45:19 +0530 Subject: [PATCH 1/4] update pr merge guideline --- CONTRIBUTING.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e101e058d1..6068bc1fc6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,12 +93,13 @@ To run tests locally, please read the [CI instructions](ci/README.md). as `work-in-progress`, or mark it as [`draft`](https://github.blog/2019-02-14-introducing-draft-pull-requests/). * Make sure [CLA](https://identity.linuxfoundation.org/projects/cncf) is signed and CI is clear. +* For non-trivial changes, please update the [CHANGELOG](./CHANGELOG.md). ### How to Get PRs Merged A PR is considered to be **ready to merge** when: -* It has received two approvals from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver) +* It has received atleast one approval from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver) / [Maintainers](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer) (at different companies). * Major feedback items/points are resolved. @@ -109,6 +110,13 @@ A PR is considered to be **ready to merge** when: Any Approver / Maintainer can merge the PR once it is **ready to merge**. +If a PR has been stuck (e.g. there are lots of debates and people couldn't agree on each other), the owner should try to get people aligned by: + +* Consolidating the perspectives and putting a summary in the PR. It is recommended to add a link into the PR description, which points to a comment with a summary in the PR conversation +* Stepping back to see if it makes sense to narrow down the scope of the PR or split it up. + +If none of the above worked and the PR has been stuck for more than 2 weeks, the owner should bring it to the (OpenTelemetry C++ SIG meeting)[https://zoom.us/j/8203130519]. + ## Useful Resources Hi! If you’re looking at this document, these resources will provide you the From f4d61d6c88a89f2032dc411088f7dcd349d8bcf8 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 2 Dec 2020 22:17:31 +0530 Subject: [PATCH 2/4] Update CONTRIBUTING.md Co-authored-by: Tom Tan --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6068bc1fc6..8043676c93 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -99,7 +99,7 @@ To run tests locally, please read the [CI instructions](ci/README.md). A PR is considered to be **ready to merge** when: -* It has received atleast one approval from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver) +* It has received at least one approval from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver) / [Maintainers](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer) (at different companies). * Major feedback items/points are resolved. From 3dd47156efa20114fa83e44c8e07ecd306a31a5f Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Thu, 3 Dec 2020 11:30:47 +0530 Subject: [PATCH 3/4] reword, and add PR from approvers --- CONTRIBUTING.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8043676c93..a851e06e8a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -99,9 +99,10 @@ To run tests locally, please read the [CI instructions](ci/README.md). A PR is considered to be **ready to merge** when: -* It has received at least one approval from [Approvers](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver) - / [Maintainers](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer) - (at different companies). +* It has received two approvals with at least one approval from [Approver](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver) + / [Maintainer](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer) + (at different company). +* A pull reqeust opened by an Approver / Maintainer can be merged with only one review from Approver / Maintainer (at different company). * Major feedback items/points are resolved. * It has been open for review for at least one working day. This gives people reasonable time to review. From cad68115235b4fb50fb3ee1dd8029cf087d2c532 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Thu, 3 Dec 2020 11:33:40 +0530 Subject: [PATCH 4/4] cosmetic --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a851e06e8a..8e4d68f743 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -102,7 +102,7 @@ A PR is considered to be **ready to merge** when: * It has received two approvals with at least one approval from [Approver](https://github.com/open-telemetry/community/blob/master/community-membership.md#approver) / [Maintainer](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer) (at different company). -* A pull reqeust opened by an Approver / Maintainer can be merged with only one review from Approver / Maintainer (at different company). +* A pull reqeust opened by an Approver / Maintainer can be merged with only one approval from Approver / Maintainer (at different company). * Major feedback items/points are resolved. * It has been open for review for at least one working day. This gives people reasonable time to review.