Skip to content

Commit

Permalink
Remove requests or suggestions about rebase and fixup contradictory t…
Browse files Browse the repository at this point in the history
…o rust-highfive bot comment (#1111)
  • Loading branch information
jhg committed Jun 24, 2021
1 parent a1ed0dd commit 48d01f8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,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 or when a reviewer asks you to perform some
changes, your PR will get marked as `S-waiting-on-author`. When you resolve
Expand Down

0 comments on commit 48d01f8

Please sign in to comment.