Skip to content

Commit ddbf6fc

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

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

doc/contributing/collaborator-guide.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,11 @@ or a link to the public vote must be given in the pull request before it lands.
179179
All Collaborator objections are considered equal. There is no greater weight given to
180180
objections from TSC members than from any other Collaborator.
181181

182-
Mistakes do happen from time-to-time. If a pull request is merged with an
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.
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.
191187

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

0 commit comments

Comments
 (0)