@@ -147,28 +147,30 @@ the TSC meeting agenda. |
147 | 147 |
|
148 | 148 | ### Waiting for Approvals |
149 | 149 |
|
150 | | -Before landing pull requests, sufficient time should be left for input |
151 | | -from other Collaborators. In general, leave at least 48 hours to account for |
152 | | -international time differences and work schedules. However, certain types of |
153 | | -pull requests can be fast-tracked and may be landed after a shorter delay. For |
154 | | -example: |
| 150 | +Before landing pull requests, allow 48 hours for input from other Collaborators. |
| 151 | +Certain types of pull requests can be fast-tracked and may land after a shorter |
| 152 | +delay. For example: |
155 | 153 |
|
156 | 154 | * Focused changes that affect only documentation and/or the test suite: |
157 | | - * `code-and-learn` tasks typically fall into this category. |
| 155 | + * `code-and-learn` tasks often fall into this category. |
158 | 156 | * `good-first-issue` pull requests may also be suitable. |
159 | 157 | * Changes that fix regressions: |
160 | 158 | * Regressions that break the workflow (red CI or broken compilation). |
161 | 159 | * Regressions that happen right before a release, or reported soon after. |
162 | 160 |
|
163 | | -When a pull request is deemed suitable to be fast-tracked, label it with |
164 | | -`fast-track` and add a comment that collaborators may upvote. Please mention any |
165 | | -Collaborators that previously approved the pull request. If someone disagrees |
166 | | -with the fast-tracking request, remove the label and leave a comment indicating |
167 | | -why the pull request should not be fast-tracked. The pull request can be landed |
168 | | -once two or more Collaborators approve both the pull request and the |
169 | | -fast-tracking request, and the necessary CI testing is done. A request to |
170 | | -fast-track a PR made by a different Collaborator than the pull-request author |
171 | | -counts as a fast-track approval. |
| 161 | +To propose fast-tracking a pull request, apply the `fast-track` label. Then add |
| 162 | +a comment that Collaborators may upvote. |
| 163 | + |
| 164 | +If someone disagrees with the fast-tracking request, remove the label. Do not |
| 165 | +fast-track the pull request in that case. |
| 166 | + |
| 167 | +The pull request may be fast-tracked if two Collaborators approve the |
| 168 | +fast-tracking request. To land, the pull request itself still needs two |
| 169 | +Collaborator approvals and a passing CI. |
| 170 | + |
| 171 | +Collaborators may request fast-tracking of pull requests they did not author. |
| 172 | +In that case only, the request itself is also one fast-track approval. Upvote |
| 173 | +the comment anyway to avoid any doubt. |
172 | 174 |
|
173 | 175 | ### Testing and CI |
174 | 176 |
|
|