Skip to content

Commit 2303e4c

Browse files
Trottjasnell
authored andcommitted
doc: rewrite consensus seeking in guide
Rewrite the Consensus Seeking section of the Collaborators Guide for easier reading, more clarity, shorter sentences, less passive voice, etc. PR-URL: #23349 Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
1 parent 0fa857f commit 2303e4c

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

COLLABORATOR_GUIDE.md

+20-24
Original file line numberDiff line numberDiff line change
@@ -139,30 +139,26 @@ the CI outcome.
139139

140140
### Consensus Seeking
141141

142-
If there is no disagreement amongst Collaborators, a pull request should be
143-
landed given appropriate review, a green CI, and the minimum
144-
[waiting time](#waiting-for-approvals) for a PR. If it is still awaiting the
145-
[minimum time to land](#waiting-for-approvals), please add the `author ready`
146-
label to it so it is obvious that the PR can land as soon as the time ends.
147-
148-
Where there is discussion amongst Collaborators, consensus should be sought if
149-
possible. The lack of consensus may indicate the need to elevate discussion to
150-
the TSC for resolution.
151-
152-
If any Collaborator objects to a change *without giving any additional
153-
explanation or context*, and the objecting Collaborator fails to respond to
154-
explicit requests for explanation or context within a reasonable period of
155-
time, the objection may be dismissed. Note that this does not apply to
156-
objections that are explained.
157-
158-
Note that breaking changes (that is, pull requests that require an increase in
159-
the major version number, known as `semver-major` changes) must be [elevated for
160-
review by the TSC](#involving-the-tsc). This does not necessarily mean that the
161-
PR must be put onto the TSC meeting agenda. If multiple TSC members approve
162-
(`LGTM`) the PR and no Collaborators oppose the PR, it should be landed. Where
163-
there is disagreement among TSC members or objections from one or more
164-
Collaborators, `semver-major` pull requests may be put on the TSC meeting
165-
agenda.
142+
If there are no objecting Collaborators, a pull request may land if it has the
143+
needed [approvals](#code-reviews), [CI](#testing-and-ci), and
144+
[wait time](#waiting-for-approvals). If a pull request meets all requirements
145+
except the [wait time](#waiting-for-approvals), please add the
146+
[`author ready`](#author-ready-pull-requests) label.
147+
148+
Where there is disagreement among Collaborators, consensus should be sought if
149+
possible. If reaching consensus is not possible, a Collaborator may escalate the
150+
issue to the TSC.
151+
152+
Collaborators should not block a pull request without providing a reason.
153+
Another Collaborator may ask an objecting Collaborator to explain their
154+
objection. If the objector is unresponsive, another Collaborator may dismiss the
155+
objection.
156+
157+
[Breaking changes](#breaking-changes) must receive
158+
[TSC review](#involving-the-tsc). If two TSC members approve the pull request
159+
and no Collaborators object, then it may land. If there are objections, a
160+
Collaborator may apply the `tsc-agenda` label. That will put the pull request on
161+
the TSC meeting agenda.
166162

167163
#### Helpful resources
168164

0 commit comments

Comments
 (0)