Skip to content

Commit

Permalink
Update and clarify a Maintainer merge rule (bevyengine#13085)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
superdump authored Apr 24, 2024
1 parent c8d214d commit 9592a40
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/the_bevy_organization.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

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).
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.

Expand Down

0 comments on commit 9592a40

Please sign in to comment.