diff options
| author | bors <bors@rust-lang.org> | 2021-10-25 08:46:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-25 08:46:51 +0000 |
| commit | 4064e971acdc92f25b50bbe7ca389623f49c3261 (patch) | |
| tree | 52ace21c77ae90993ee1ff6f5ede55fdba0a811f | |
| parent | 73a443d611f7e412ee11c2d216fdb0755b1721dc (diff) | |
| parent | 1b2c57c2dd11df9c3c3cae51870be67ccfef65bc (diff) | |
| download | rust-4064e971acdc92f25b50bbe7ca389623f49c3261.tar.gz rust-4064e971acdc92f25b50bbe7ca389623f49c3261.zip | |
Auto merge of #7872 - calebcartwright:sync-use-new-branch, r=flip1995
recommend new branch or deleting branch when synching from rust changelog: none r? `@flip1995` - thanks again for your assistance in zulip earlier, figured I'd take a pass at incorporating your recommendation to delete or use a new branch into the excellent docs here
| -rw-r--r-- | CONTRIBUTING.md | 4 |
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 ``` |