From c62c96ee6fd1a48610b1c2e59b55817f1ac00d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Hern=C3=A1ndez?= Date: Thu, 24 Jun 2021 18:50:50 +0200 Subject: [PATCH] Remove requests or suggestions about rebase and fixup contradictory to rust-highfive bot comment (#1111) --- src/contributing.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/contributing.md b/src/contributing.md index d8f7a79a..9df9b6df 100644 --- a/src/contributing.md +++ b/src/contributing.md @@ -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