forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update and clarify a Maintainer merge rule (#13085)

Browse Source 
* Maintainers count as community members
* The review of the maintainer wanting to merge the PR counts

In practice this means that if a maintainer approves a PR, they would no
longer need two reviews from _other_ community members, only one.
This commit is contained in:
Robert Swain 2024-04-24 17:19:38 +02:00 committed by GitHub
parent c8d214d505
commit 9592a40e1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/the_bevy_organization.md
View File

@ -19,7 +19,7 @@ Maintainers have merge rights in Bevy repos. They assess the scope of pull reque
Maintainers abide by the following rules when merging pull requests: Maintainers abide by the following rules when merging pull requests:
1. Trivial PRs can be merged without approvals. 1. Trivial PRs can be merged without approvals.
2. Relatively uncontroversial PRs can be merged following approval from at least two other community members with appropriate expertise. 2. Relatively uncontroversial PRs can be merged following approval from at least two community members (including Maintainers) with appropriate expertise.
3. Controversial PRs cannot be merged unless they have the approval of a Project Lead or two Subject Matter Experts (in the "area" of the PR). 3. Controversial PRs cannot be merged unless they have the approval of a Project Lead or two Subject Matter Experts (in the "area" of the PR).
4. If two Maintainers have approved a controversial PR they can "start the clock" on a PR by adding it to [this queue](https://github.com/orgs/bevyengine/projects/6). If 45 days elapse without SME or Project Lead action (approval, feedback or an explicit request to defer), the PR can be merged by maintainers. 4. If two Maintainers have approved a controversial PR they can "start the clock" on a PR by adding it to [this queue](https://github.com/orgs/bevyengine/projects/6). If 45 days elapse without SME or Project Lead action (approval, feedback or an explicit request to defer), the PR can be merged by maintainers.