From da57e09434ff4d21b4196ae7b7fa349e504bae96 Mon Sep 17 00:00:00 2001 From: Luuk Scholten Date: Thu, 30 Apr 2015 10:37:35 +0200 Subject: [PATCH] Fix contradicting merge policy rules --- contributing/code/core_team.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index b5c3179c7ed..4068bcdb936 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -117,11 +117,10 @@ Pull Request Merging Policy A pull request **can be merged** if: -* Enough time was given for peer reviews (a few minutes for typos or minor - changes, at least 2 days for "regular" pull requests, and 4 days for pull - requests with "a significant impact"); +* It is a minor change [1]_; -* It is a minor change [1]_, regardless of the number of votes; +* Enough time was given for peer reviews (at least 2 days for "regular" + pull requests, and 4 days for pull requests with "a significant impact"); * At least the component's **Merger** or two other Core members voted ``+1`` and no Core member voted ``-1``.