about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCaleb Cartwright <calebcartwright@users.noreply.github.com>2021-10-24 15:14:45 -0500
committerGitHub <noreply@github.com>2021-10-24 15:14:45 -0500
commit1b2c57c2dd11df9c3c3cae51870be67ccfef65bc (patch)
tree52ace21c77ae90993ee1ff6f5ede55fdba0a811f
parent73a443d611f7e412ee11c2d216fdb0755b1721dc (diff)
downloadrust-1b2c57c2dd11df9c3c3cae51870be67ccfef65bc.tar.gz
rust-1b2c57c2dd11df9c3c3cae51870be67ccfef65bc.zip
docs: recommend new branch
-rw-r--r--CONTRIBUTING.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4273fda4e64..97ff31b4bc5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -262,7 +262,9 @@ to be run inside the `rust` directory):
 2. Checkout the commit from the latest available nightly. You can get it using `rustup check`.
 3. Sync the changes to the rust-copy of Clippy to your Clippy fork:
     ```bash
-    # Make sure to change `your-github-name` to your github name in the following command
+    # Make sure to change `your-github-name` to your github name in the following command. Also be
+    # sure to either use a net-new branch, e.g. `sync-from-rust`, or delete the branch beforehand
+    # because changes cannot be fast forwarded
     git subtree push -P src/tools/clippy git@github.com:your-github-name/rust-clippy sync-from-rust
     ```