Skip to content

Commit 7b03055

Browse files
committed
upd approve rules
1 parent bdc6e5e commit 7b03055

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

faq.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ Create a separate branch for each task in your private fork. Complete the task i
7878

7979
##### <ins>*- When is a task considered completed?*</ins><br/>
8080

81-
A task is marked as completed when you've made a Pull Request, and it's been reviewed, approved and merged. After you complete your Pull Request, remove the "NOT READY / DRAFT / WIP" marker from the title and specify [our bot](https://github.com/1tbot) as a reviewer and tag all of your mentors in the comments section. Before mentor can merge your pull request into the main branch, you need to receive approval. If more than one mentor has reviewed your Pull Request and requested changes, you must receive approval from all involved mentors. If all the conditions are executed, mentors will be able to merge your PR and task considered as completed.
81+
A task is marked as completed when you've made a Pull Request, and it's been reviewed and approved by all your mentors. After you complete your Pull Request, remove the "NOT READY / DRAFT / WIP" marker from the title and specify [our bot](https://github.com/1tbot) as a reviewer and tag all of your mentors in the comments section. Before [our bot](https://github.com/1tbot) can merge your pull request into the main branch, you need to receive approval. Before your pull request can be merged into the main branch, you must receive approval from all of your assigned mentors.
8282

8383
##### <ins>*- How do mentors distinguish between finished Pull Requesters and unfinished Pull Requesters?*</ins><br/>
8484

85-
A task is marked as completed when you've made a Pull Request, and it's been reviewed and approved by one of the reviewers. After you complete your Pull Request, remove the "NOT READY / DRAFT / WIP" marker from the title and specify [our bot](https://github.com/1tbot) as a reviewer and tag all of your mentors in the comments section.
85+
A task is marked as completed when you've made a Pull Request, and it's been reviewed and approved by all your mentors. After you complete your Pull Request, remove the "NOT READY / DRAFT / WIP" marker from the title and specify [our bot](https://github.com/1tbot) as a reviewer and tag all of your mentors in the comments section.
8686
##### <ins>*- Should I open an unfinished PR?*</ins><br/>
8787

8888
Yes, you should. Open a PR as soon as you can, marking it with "NOT READY / DRAFT / WIP" in the title . Your mentors will review it once you remove this marker and specify [our bot](https://github.com/1tbot) as a reviewer and tag all of your mentors in the comments section.
@@ -91,9 +91,9 @@ Yes, you should. Open a PR as soon as you can, marking it with "NOT READY / DRAF
9191

9292
Please don't do PR merge yourself. Your mentors make the merge themselves.
9393

94-
##### <ins>*- How many mentors need to approve before I can merge?*</ins><br/>
94+
##### <ins>*- How many mentors need to approve before bot can merge?*</ins><br/>
9595

96-
You need approval from at least one mentor before merging the Pull Request into the main branch. However, if more than one mentor has reviewed your Pull Request and requested changes, you must receive approval from all of them.
96+
To improve the quality of reviews and accelerate the exchange of experience, a PR must be approved by all of your mentors. A task will not be considered completed without receiving approval from every assigned mentor.
9797

9898
##### <ins>*- Where should I answer the questions in the first chapter?*</ins><br/>
9999

orientation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ This course is continually evolving, and it's important to stay updated with the
174174
For each task of the rustcamp, you should create and submit a separate [PR (pull request)][PR]. Make sure to give your PR a [relevant title](https://github.com/rust-lang-ua/rustcamp/blob/master/faq.md#--how-should-i-name-pr). After you've completed your pull request, please remove any markers like "NOT READY", "DRAFT", or "WIP" from the title and specify [our bot](https://github.com/1tbot) as a reviewer and tag all of your mentors in the comments section. All communication about PR-s happens via GitHub, so please always use the PR comment section to tag mentors and ask for a review.
175175

176176
Please, don't do PR merge yourself.
177-
Before merging the pull request into the main branch, you need to receive approval from at least one mentor. If more than one mentor has reviewed your Pull Request and requested changes, you must receive approval from all involved mentors. If all the conditions are executed, [our bot](https://github.com/1tbot) will be able to merge your PR.
177+
To ensure a thorough review and exchange of experience between mentors, your pull request must be approved by **all** of your assigned mentors before it can be merged into the main branch. After receiving approvals from all mentors, [our bot](https://github.com/1tbot) will merge your PR.
178178

179179
Each task of the rustcamp is a [Cargo workspace member][workspace], meaning you can run and test it from the project root using commands like `cargo run -p task_1_8`. We highly recommend using tools like [rustfmt] and [Clippy] while writing your [Rust] code.
180180

0 commit comments

Comments
 (0)