Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9b7bc3e

Browse filesBrowse files
committed
minor #16329 Clarify Pull Request Merging Policy (kbond)
This PR was submitted for the 6.1 branch but it was merged into the 4.4 branch instead. Discussion ---------- Clarify Pull Request Merging Policy I had a bit of confusion with the policy so I thought I'd clarify the policy based on my understanding. If my understanding is wrong, let me know! Commits ------- 11817e1 Clarify Pull Request Merging Policy
2 parents 964f488 + 11817e1 commit 9b7bc3e
Copy full SHA for 9b7bc3e

File tree

Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-3
lines changed

‎contributing/code/core_team.rst

Copy file name to clipboardExpand all lines: contributing/code/core_team.rst
+7-3Lines 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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.