diff options
| author | Mike Danese <mikedanese@gmail.com> | 2015-07-31 10:21:25 -0700 |
|---|---|---|
| committer | Mike Danese <mikedanese@gmail.com> | 2015-07-31 10:21:25 -0700 |
| commit | f82dc338420c0ecacaab93ef7bb7ef0d80dcbbe4 (patch) | |
| tree | a4ef33d9aa33f774e6477a4dedf3123759f47653 /collab.md | |
| parent | e605969e9a2636a2a1c4c1f86c7ea9596bbf3174 (diff) | |
| parent | 9a5c3748cc3469907bef1c8b053df544ed1d7f54 (diff) | |
Merge pull request #11839 from eparis/munger-rewrite
Major rewrite for docs munger
Diffstat (limited to 'collab.md')
| -rw-r--r-- | collab.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -61,7 +61,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 +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 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. |