Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating PR Guidelines #413

Merged
merged 4 commits into from
Dec 3, 2020
Merged

Updating PR Guidelines #413

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
982c34a
update pr merge guideline
lalitb Dec 2, 2020
f4d61d6
Update CONTRIBUTING.md
lalitb Dec 2, 2020
3dd4715
reword, and add PR from approvers
lalitb Dec 3, 2020
cad6811
cosmetic
lalitb Dec 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
lalitb marked this conversation as resolved.
Show resolved Hide resolved
/ [Maintainers](https://github.com/open-telemetry/community/blob/master/community-membership.md#maintainer)
(at different companies).
lalitb marked this conversation as resolved.
Show resolved Hide resolved
* Major feedback items/points are resolved.
Expand All @@ -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
Expand Down