Skip to content

Commit 9592a40

Browse files
authored
Update and clarify a Maintainer merge rule (#13085)
* 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.
1 parent c8d214d commit 9592a40

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

docs/the_bevy_organization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Maintainers have merge rights in Bevy repos. They assess the scope of pull reque
1919
Maintainers abide by the following rules when merging pull requests:
2020

2121
1. Trivial PRs can be merged without approvals.
22-
2. Relatively uncontroversial PRs can be merged following approval from at least two other community members with appropriate expertise.
22+
2. Relatively uncontroversial PRs can be merged following approval from at least two community members (including Maintainers) with appropriate expertise.
2323
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).
2424
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.
2525

0 commit comments

Comments
 (0)