Skip to content

Commit 2ca5c3c

Browse files
authored
Update doc/contributing/collaborator-guide.md
1 parent 64a0111 commit 2ca5c3c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

doc/contributing/collaborator-guide.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -180,13 +180,14 @@ All Collaborator objections are considered equal. There is no greater weight giv
180180
objections from TSC members than from any other Collaborator.
181181

182182
Mistakes do happen from time-to-time. If a pull request is merged with an
183-
outstanding objection, corrective action must be taken. Any Collaborator
184-
can open a pull request that either reverts the change or makes an additional
185-
follow-up change that addresses the objection. While an automatic or immediate
186-
revert is not always necessary or ideal, such corrections are typically
187-
subject to (but not required to) be fast-tracked. There are times in which
188-
taking a slower path may be preferable to ensure appropriate consensus
189-
moving forward.
183+
unresolved objection, corrective action must be taken. What corrective
184+
action to take will vary on the nature of that objection. Some might be
185+
simple to resolve just by opening a follow-up PR that addresses it; others
186+
may require a full revert. When in doubt, it's likely best to propose a full
187+
revert, but use your judgement as other options might be available. In every
188+
case it is most likely the correction will be fast-tracked. There are times,
189+
however, when taking a slower path may be preferable, or even necessary, to
190+
ensure appropriate consensus or stability moving forward.
190191

191192
Collaborators objecting to a pull request can best ensure their objections
192193
are addressed by remaining actively engaged and responsive in the discussion.

0 commit comments

Comments
 (0)