Skip to content

Commit 62667c8

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Clarify Pull Request Merging Policy
2 parents 59d652c + 9b7bc3e commit 62667c8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

contributing/code/core_team.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,13 @@ A pull request **can be merged** if:
150150

151151
* Enough time was given for peer reviews;
152152

153-
* At least two **Mergers Team** members voted ``+1`` (only one if the submitter
154-
is part of the Mergers team) and no Core member voted ``-1`` (via GitHub
155-
reviews or as comments).
153+
* It is a bug fix and at least two **Mergers Team** members voted ``+1``
154+
(only one if the submitter is part of the Mergers team) and no Core
155+
member voted ``-1`` (via GitHub reviews or as comments).
156+
157+
* It is a new feature and at least two **Mergers Team** members voted
158+
``+1`` (if the submitter is part of the Mergers team, two *other* members)
159+
and no Core member voted ``-1`` (via GitHub reviews or as comments).
156160

157161
Pull Request Merging Process
158162
~~~~~~~~~~~~~~~~~~~~~~~~~~~~

0 commit comments

Comments
 (0)