From 11817e10ddc78c1f9ba93ee9535d6670a3209812 Mon Sep 17 00:00:00 2001 From: Kevin Bond Date: Mon, 27 Dec 2021 11:04:16 -0500 Subject: [PATCH] Clarify Pull Request Merging Policy --- contributing/code/core_team.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index 1607c7c0252..a659666c2ec 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -150,9 +150,13 @@ A pull request **can be merged** if: * Enough time was given for peer reviews; -* At least two **Mergers Team** members voted ``+1`` (only one if the submitter - is part of the Mergers team) and no Core member voted ``-1`` (via GitHub - reviews or as comments). +* It is a bug fix and at least two **Mergers Team** members voted ``+1`` + (only one if the submitter is part of the Mergers team) and no Core + member voted ``-1`` (via GitHub reviews or as comments). + +* It is a new feature and at least two **Mergers Team** members voted + ``+1`` (if the submitter is part of the Mergers team, two *other* members) + and no Core member voted ``-1`` (via GitHub reviews or as comments). Pull Request Merging Process ~~~~~~~~~~~~~~~~~~~~~~~~~~~~