We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent a1ed0dd commit 48d01f8Copy full SHA for 48d01f8
src/contributing.md
@@ -145,8 +145,7 @@ CI will also run tidy and will fail if tidy fails.
145
Rust follows a _no merge-commit policy_, meaning, when you encounter merge
146
conflicts you are expected to always rebase instead of merging. E.g. always use
147
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.
+branch.
150
151
If you encounter merge conflicts or when a reviewer asks you to perform some
152
changes, your PR will get marked as `S-waiting-on-author`. When you resolve
0 commit comments