From a8d2934f21b0f52e7940c4c4d4c46c9d8ac1af3c Mon Sep 17 00:00:00 2001 From: Lukas Tenbrink Date: Fri, 7 Nov 2025 12:16:55 +0100 Subject: [PATCH] Update the review and merge process. --- organization/pull_requests/review_process.rst | 58 ++++++------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/organization/pull_requests/review_process.rst b/organization/pull_requests/review_process.rst index 21255f5..4d29838 100644 --- a/organization/pull_requests/review_process.rst +++ b/organization/pull_requests/review_process.rst @@ -1,57 +1,33 @@ Review and merge process ======================== -.. note:: - - This page is intended to provide insight into the pull request (PR) review - process that we aspire to. As such, it is primarily targeted at engine - maintainers who are responsible for reviewing and approving pull requests. - That being said, much of the content is useful for prospective contributors - wanting to know how to ensure that their PR is merged. - From a high level, the ideal life cycle of a pull request looks like the following: - 1. A contributor opens a PR that fixes a specific problem (optimally closing - a GitHub `issue `_ or implementing - a `proposal `_). + 1. A contributor :ref:`opens a pull request ` that fixes a + specific problem (ideally closing a GitHub `issue `_ + or implementing a `proposal `_). - 2. Other contributors provide feedback on the PR (including reviewing and/or - approving the PR, as appropriate). + 2. The :ref:`bugsquad and triage team ` **categorize** the pull request, + adding appropriate tags and requesting reviews from :ref:`area maintainers `. - 3. An engine maintainer reviews the code and provides feedback, requests - changes, or approves the pull request, as appropriate. + 3. Contributors discuss **whether the approach of the PR is appropriate** to fix the problem + at hand, and leave feedback. - 4. Another maintainer reviews the code with a focus on code style/clarity and - approves it once satisfied. + 4. Contributors **review the code**, and iterate improvements with the pull request author. + When they are satisfied, they will approve the pull request. - 5. A team leader or a member of the `production team - `_ merges the pull request if - satisfied that it has been sufficiently reviewed. - -This document will explain steps 2, 3, 4, and 5 in more detail. For a more -detailed explanation of the pull request workflow please see the :ref:`pull -request workflow document `. + 5. A release manager merges the pull request when there are sufficient approvals. A pull request + always needs approvals from the respective :ref:`area maintainers `, but reviews + from other contributors help. .. note:: - In practice these steps may blend together. Oftentimes maintainers will - provide comments on code style and code quality at the same time and will - approve a pull request for both. + In practice, the above steps may often blend together. -Typically the first interaction on a pull request will be an engine maintainer -assigning tags to the pull request and flagging it for review by someone -familiar with that area of code. - -Engine maintainers are folks who are "members" of the Godot project repository -on GitHub and/or are listed on the `Teams page `_ -on the Godot website. Maintainers are responsible for a given area of the -engine. Typically this means they are the people who are given more trust to -approve and recommend pull requests for merging. - -Even if you are not a maintainer, you can still help by reviewing code, -providing feedback on PRs and testing PRs locally on your machine to confirm -that they work as intended. Many of the currently active maintainers started out -doing this before they became maintainers. +Even if you are not a maintainer, you can still help by :ref:`reviewing `, +providing feedback, and :ref:`testing PRs ` locally on your machine +to confirm that they work as intended. Many of the currently active maintainers started out doing +this before they became maintainers. When will a pull request get reviewed? --------------------------------------