Update collab.md
This commit is contained in:
parent
63baced5cd
commit
aabe08d507
|
@ -46,42 +46,6 @@ assignee becomes the shepherd for that PR and is responsible for merging the PR
|
||||||
once they are satisfied with it or else closing it. The assignee might request
|
once they are satisfied with it or else closing it. The assignee might request
|
||||||
reviews from non-maintainers.
|
reviews from non-maintainers.
|
||||||
|
|
||||||
## Merge hours
|
|
||||||
|
|
||||||
Maintainers will do merges of appropriately reviewed-and-approved changes during
|
|
||||||
their local "business hours" (typically 7:00 am Monday to 5:00 pm (17:00h)
|
|
||||||
Friday). PRs that arrive over the weekend or on holidays will only be merged if
|
|
||||||
there is a very good reason for it and if the code review requirements have been
|
|
||||||
met. Concretely this means that nobody should merge changes immediately before
|
|
||||||
going to bed for the night.
|
|
||||||
|
|
||||||
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
|
|
||||||
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.
|
|
||||||
|
|
||||||
|
|
||||||
## 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.
|
|
||||||
|
|
||||||
|
|
||||||
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
|
<!-- BEGIN MUNGE: GENERATED_ANALYTICS -->
|
||||||
[]()
|
[]()
|
||||||
<!-- END MUNGE: GENERATED_ANALYTICS -->
|
<!-- END MUNGE: GENERATED_ANALYTICS -->
|
||||||
|
|
Loading…
Reference in New Issue