Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove requests or suggestions about rebase and fixup contradictory to rust-highfive bot comment #1111

Merged
merged 3 commits into from
Jun 24, 2021
Merged

Remove requests or suggestions about rebase and fixup contradictory to rust-highfive bot comment #1111

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff66b08
Remove request of rebase to fixup commits to follow recommendation of…
jhg Apr 18, 2021
2b47fd3
Remove suggestions about rebase to fixup or add additional changes re…
jhg Apr 18, 2021
a4e4ddb
Revert deletion of tips that does not produce confusion about guideli…
jhg Apr 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/contributing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ CI will also run tidy and will fail if tidy fails.
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
rebase when bringing the latest changes from the master branch to your feature
branch. Also, please make sure that fixup commits are squashed into other
related commits with meaningful commit messages.
branch.

If you encounter merge conflicts, your PR will get marked as `S-waiting-on-author`.
When you resolve them, you should use `@rustbot` to mark it as `S-waiting-on-review`.
Expand Down