From 9592a40e1eb387f926b787cbb3a65d9db1dfb1a3 Mon Sep 17 00:00:00 2001 From: Robert Swain Date: Wed, 24 Apr 2024 17:19:38 +0200 Subject: [PATCH] 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. --- docs/the_bevy_organization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/the_bevy_organization.md b/docs/the_bevy_organization.md index b5e0589f59cd8..22b974ad08a1b 100644 --- a/docs/the_bevy_organization.md +++ b/docs/the_bevy_organization.md @@ -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.