Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix contradicting merging policy rules #5219

Merged
merged 1 commit into from
May 10, 2015
Merged

Fix contradicting merging policy rules #5219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions contributing/code/core_team.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``.
Expand Down