mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mention label has-merge-commits

This commit is contained in:
León Orell Valerian Liehr 2024-01-14 10:32:35 +01:00 committed by Nilstrieb
parent 1fb019f237
commit 034cee9ed6
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/contributing.md
View File

@ -243,7 +243,13 @@ The CI will also run tidy and will fail if tidy fails.
Rust follows a _no merge-commit policy_, meaning, when you encounter merge Rust follows a _no merge-commit policy_, meaning, when you encounter merge
conflicts you are expected to always rebase instead of merging. E.g. always use conflicts you are expected to always rebase instead of merging. E.g. always use
rebase when bringing the latest changes from the master branch to your feature rebase when bringing the latest changes from the master branch to your feature
branch. branch. If your PR contains merge commits, it will get marked as `has-merge-commits`.
Once you have removed the merge commits, e.g., through an interactive rebase, you
should remove the label again:
@rustbot label -has-merge-commits
See [this chapter][labeling] for more details.
If you encounter merge conflicts or when a reviewer asks you to perform some If you encounter merge conflicts or when a reviewer asks you to perform some
changes, your PR will get marked as `S-waiting-on-author`. When you resolve changes, your PR will get marked as `S-waiting-on-author`. When you resolve
@ -251,8 +257,6 @@ them, you should use `@rustbot` to mark it as `S-waiting-on-review`:
@rustbot label -S-waiting-on-author +S-waiting-on-review @rustbot label -S-waiting-on-author +S-waiting-on-review
See [this chapter][labeling] for more details.
GitHub allows [closing issues using keywords][closing-keywords]. This feature GitHub allows [closing issues using keywords][closing-keywords]. This feature
should be used to keep the issue tracker tidy. However, it is generally preferred should be used to keep the issue tracker tidy. However, it is generally preferred
to put the "closes #123" text in the PR description rather than the issue commit; to put the "closes #123" text in the PR description rather than the issue commit;