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

Update the PR merge criteria to allow situational judgement #4227

Merged
merged 2 commits into from
Sep 26, 2024
Merged

Update the PR merge criteria to allow situational judgement #4227

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00f856b
Update the PR merge criteria to allow situational judgement
reyang Sep 25, 2024
9dd26af
Merge branch 'main' into reyang/update-merge-criteria
reyang Sep 26, 2024
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
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,10 @@ A PR is considered to be **ready to merge** when:
people reasonable time to review.
* Trivial changes (typos, cosmetic changes, CI improvements, etc.) don't have to
wait for two days.
* The [spec
maintainers](https://github.com/open-telemetry/community/blob/main/community-members.md#specifications-and-proto)
might make situational judgement and put additional requirements (e.g. need
more approvals, wait for the next release train, etc.).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Follow-up: Once open-telemetry/oteps#266 is approved and implemented, I think this list should explicitly mention the 4 approvals required for new OTEPs (and less for editorial fixes on merged OTEPs, if necessary) rather than this being a situational judgement call.

Any [spec
maintainer](https://github.com/open-telemetry/community/blob/main/community-members.md#specifications-and-proto) can
Expand Down
Loading