Skip to content

Commit 4722829

Browse files
committed
add some explain for rustbot commands
1 parent 45fa404 commit 4722829

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

Diff for: src/contributing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ If you encounter merge conflicts or when a reviewer asks you to perform some
249249
changes, your PR will get marked as `S-waiting-on-author`. When you resolve
250250
them, you should use `@rustbot` to mark it as `S-waiting-on-review`:
251251

252-
@rustbot label -S-waiting-on-author +S-waiting-on-review
252+
@rustbot ready
253253

254254
See [this chapter][labeling] for more details.
255255

Diff for: src/walkthrough.md

+10-3
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,17 @@ request that reviewer by leaving a comment on the thread with `r?
186186
@reviewer-github-id` (e.g. `r? @eddyb`). If you don't know who to request,
187187
don't request anyone; the bot will assign someone automatically based on which files you changed.
188188

189-
The reviewer may request changes before they approve your PR. Feel free to ask
190-
questions or discuss things you don't understand or disagree with. However,
189+
The reviewer may request changes before they approve your PR, they may mark the PR with label
190+
"S-waiting-on-author" after leaving comments, this means that the PR is blocked on you to making
191+
some requested changes. When you finished iterating on the changes, you can mark the PR as
192+
`S-waiting-on-review` again by leaving a comment with `@rustbot ready`, this will remove the
193+
`S-waiting-on-author` label and add the `S-waiting-on-review` label.
194+
195+
Feel free to ask questions or discuss things you don't understand or disagree with. However,
191196
recognize that the PR won't be merged unless someone on the Rust team approves
192-
it.
197+
it. If a reviewer leave a comment like `r=me after fixing ...`, that means they approve the PR and
198+
you can merge it with comment with `@bors r=reviwer-github-id`(e.g. `@bors r=eddyb`) to merge it
199+
after fixing lefted trivial issues.
193200

194201
When your reviewer approves the PR, it will go into a queue for yet another bot
195202
called `@bors`. `@bors` manages the CI build/merge queue. When your PR reaches

0 commit comments

Comments
 (0)