Skip to content

Commit 41b4f4d

Browse files
jasnellRafaelGSS
authored andcommitted
meta: clarify pr objection process further
Based on some recent confusion around the objection process for PRs, this commit adds some additional clarification to the collaborator guide. Specifically, it clarifies that: * Objections must be made in the PR itself * All objections are considered equal... no special additional weight is given to objections from TSC members. * When mistakes happen and a PR lands despite having an unresolved objection, any revert or fixup PR is subject to the same regular objection process, albeit with a callout that fast-tracking is possible if uncontroversial. PR-URL: #59096 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Ruy Adorno <ruy@vlt.sh> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Stewart X Addison <sxa@redhat.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
1 parent 8341916 commit 41b4f4d

File tree

1 file changed

+23
-5
lines changed

1 file changed

+23
-5
lines changed

doc/contributing/collaborator-guide.md

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,13 @@ requirements. If a pull request meets all requirements except the
154154

155155
Collaborators can object to a pull request by using the "Request
156156
Changes" GitHub feature. Dissent comments alone don't constitute an
157-
objection. Any pull request objection must include a clear reason for that
158-
objection, and the objector must remain responsive for further discussion
159-
towards consensus about the direction of the pull request. Where possible,
160-
provide a set of actionable steps alongside the objection.
157+
objection, nor do dissenting comments made in any associated issue.
158+
A blocking objection to a change must be made in the pull request that
159+
specifically proposes that change. Any pull request objection must include
160+
a clear reason for that objection, and the objector must remain responsive
161+
for further discussion towards consensus about the direction of the pull
162+
request. Where possible, provide a set of actionable steps alongside the
163+
objection.
161164

162165
If the objection is not clear to others, another collaborator can ask an
163166
objecting collaborator to explain their objection or to provide actionable
@@ -168,7 +171,22 @@ dismiss the objection.
168171
Pull requests with outstanding objections must remain open until all
169172
objections are satisfied. If reaching consensus is not possible, a
170173
collaborator can escalate the issue to the TSC by pinging `@nodejs/tsc` and
171-
adding the `tsc-agenda` label to the issue.
174+
adding the `tsc-agenda` label to the issue. The change cannot proceed without
175+
either reaching consensus or a TSC decision to dismiss the objection(s). If the
176+
TSC does choose to dismiss any objections, a clear explanation of the reasoning
177+
or a link to the public vote must be given in the pull request before it lands.
178+
179+
All Collaborator objections are considered equal. There is no greater weight given to
180+
objections from TSC members than from any other Collaborator.
181+
182+
Mistakes do happen. If a pull request is merged with an unresolved objection,
183+
submit a fix. Simple issues may be fixed with a follow-up PR that addresses
184+
the concern. More difficult issues may require a full revert. Most corrections
185+
can be fast-tracked. If deemed necessary take a slower route to ensure stability
186+
and consensus.
187+
188+
Collaborators objecting to a pull request can best ensure their objections
189+
are addressed by remaining engaged and responsive in the discussion.
172190

173191
#### Helpful resources
174192

0 commit comments

Comments
 (0)