Skip to content

Commit 48d01f8

Browse files
authored
Remove requests or suggestions about rebase and fixup contradictory to rust-highfive bot comment (#1111)
1 parent a1ed0dd commit 48d01f8

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/contributing.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ CI will also run tidy and will fail if tidy fails.
145145
Rust follows a _no merge-commit policy_, meaning, when you encounter merge
146146
conflicts you are expected to always rebase instead of merging. E.g. always use
147147
rebase when bringing the latest changes from the master branch to your feature
148-
branch. Also, please make sure that fixup commits are squashed into other
149-
related commits with meaningful commit messages.
148+
branch.
150149

151150
If you encounter merge conflicts or when a reviewer asks you to perform some
152151
changes, your PR will get marked as `S-waiting-on-author`. When you resolve

0 commit comments

Comments
 (0)