Skip to content

Commit 653d88a

Browse files
mmarchiniaddaleax
authored andcommitted
doc: reduce repetitiveness on Consensus Seeking
Rearrange Consensus Seeking section to reduce repetitiveness. Ref: #34639 (comment) Ref: #34639 (comment) PR-URL: #34702 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Guy Bedford <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
1 parent 335b61a commit 653d88a

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

doc/guides/collaborator-guide.md

+18-19
Original file line numberDiff line numberDiff line change
@@ -114,34 +114,33 @@ pull request creator pushed new code since the last CI run.
114114

115115
### Consensus Seeking
116116

117-
If there are no objecting Collaborators, a pull request may land if it has the
118-
needed [approvals](#code-reviews), [CI](#testing-and-ci), and
119-
[wait time](#waiting-for-approvals). If a pull request meets all requirements
120-
except the [wait time](#waiting-for-approvals), please add the
117+
A pull request may land if it has the needed [approvals](#code-reviews),
118+
[CI](#testing-and-ci), [wait time](#waiting-for-approvals) and no
119+
[outstanding objections](#objections). [Breaking changes](#breaking-changes)
120+
must receive [TSC review](#involving-the-tsc) in addition to other
121+
requirements. If a pull request meets all requirements except the
122+
[wait time](#waiting-for-approvals), please add the
121123
[`author ready`](#author-ready-pull-requests) label.
122124

123-
If a collaborator believes a pull request should not land as is, **the "Request
124-
Changes" GitHub feature must be used to make the objection explicit**. An
125-
implicit objection not using the "Request Changes" feature is not a
126-
blocker for a pull request. Pull requests with an explicit objection should
127-
not land until all objections are satisfied. Collaborators should not block a
128-
pull request without providing a reason. **Providing a set of actionable steps
129-
alongside the objection is recommended, and the objector must be willing to
130-
work with the pull request author to reach a consensus about the direction of
131-
the pull request**. If reaching consensus is not possible, a Collaborator may
132-
escalate the issue to the TSC.
125+
#### Objections
126+
127+
**Collaborators may object to a pull request by using the "Request
128+
Changes" GitHub feature**. Dissent comments alone don't constitute an
129+
objection. **Any PR objection must include a clear reason for that objection,
130+
and the objector must remain responsive for further discussion towards
131+
consensus about the direction of the pull request**. Providing a set of
132+
actionable steps alongside the objection is recommended.
133133

134134
If the objection is not clear to others, another Collaborator may ask an
135135
objecting Collaborator to explain their objection or to provide actionable
136136
steps to resolve the objection. **If the objector is unresponsive for seven
137137
days after a collaborator asks for clarification, another Collaborator may
138138
dismiss the objection**.
139139

140-
[Breaking changes](#breaking-changes) must receive
141-
[TSC review](#involving-the-tsc). If two TSC members approve the pull request
142-
and no Collaborators object, then it may land. If there are objections, a
143-
Collaborator may apply the `tsc-agenda` label. That will put the pull request on
144-
the TSC meeting agenda.
140+
**Pull requests with outstanding objections must remain open until all
141+
objections are satisfied**. If reaching consensus is not possible, a
142+
Collaborator may escalate the issue to the TSC by pinging `@nodejs/tsc` and
143+
adding the `tsc-agenda` label to the issue.
145144

146145
#### Helpful resources
147146

0 commit comments

Comments
 (0)