minor #5219 Fix contradicting merging policy rules (lscholten)

wouterj · wouterj · commit a9445c978106 · 2015-05-10T15:33:04.000+02:00
This PR was merged into the 2.3 branch. Discussion ---------- Fix contradicting merging policy rules | Q | A | ------------------ | --- | Doc fix? | yes | New docs? | no | Applies to | 2.3+ | Fixed tickets | #5148 I've removed "a few minutes for typos or minor changes" from the first rule, fixing the contradiction and the redundancy. I've also reordered the rules to remove "regardless of the number of votes" from the minor change rule. Commits ------- da57e09 Fix contradicting merge policy rules
diff --git 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``.
