Add some more clarity around "controversial" or "complex" PRs and mer…

…ging.
kubernetes · Apr 2, 2015 · bd0ee98 · bd0ee98
1 parent 4adc20e
commit bd0ee98
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/docs/devel/collab.md b/docs/devel/collab.md
@@ -28,6 +28,13 @@ Maintainers will do merges of appropriately reviewed-and-approved changes during
 
 There may be discussion an even approvals granted outside of the above hours, but merges will generally be deferred.
 
+If a PR is considered complex or controversial, the merge of that PR should be delayed to give all interested parties in all timezones the opportunity to provide feedback.  Concretely, this means that such PRs should be held for 24 
+hours before merging.  Of course "complex" and "controversial" are left to the judgement of the people involved, but we trust that part of being a committer is the judgement required to evaluate such things honestly, and not be
+motivated by your desire (or your cube-mate's desire) to get their code merged.  Also see "Holds" below, any reviewer can issue a "hold" to indicate that the PR is in fact complicated or complex and deserves further review.
+
+PRs that are incorrectly judged to be merge-able, may be reverted and subject to re-review, if subsequent reviewers believe that they in fact are controversial or complex.
+
+
 ## Holds
 
 Any maintainer or core contributor who wants to review a PR but does not have time immediately may put a hold on a PR simply by saying so on the PR discussion and offering an ETA measured in single-digit days at most.  Any PR that has a hold shall not be merged until the person who requested the hold acks the review, withdraws their hold, or is overruled by a preponderance of maintainers.