summaryrefslogtreecommitdiff
path: root/collab.md
diff options
context:
space:
mode:
authorGeorge Kuan <commonlisp@gmail.com>2015-04-26 19:37:14 -0700
committerGeorge Kuan <commonlisp@gmail.com>2015-04-26 19:37:14 -0700
commiteb7b52f95ad2af7378be8ca2ab3bbba8b1a00f34 (patch)
tree7d1636f0eac6bb135ba0d6ca2b4b6fd6da62dd18 /collab.md
parent77e469b2870d2fda54fa2555d63edf5965cc26b8 (diff)
Corrected some typos
Diffstat (limited to 'collab.md')
-rw-r--r--collab.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/collab.md b/collab.md
index dd7b8059..000fb6ea 100644
--- a/collab.md
+++ b/collab.md
@@ -29,7 +29,7 @@ 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
+hours before merging. Of course "complex" and "controversial" are left to the judgment of the people involved, but we trust that part of being a committer is the judgment 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.