Skip to content

Commit 4064e97

Browse files
committed
Auto merge of rust-lang#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
2 parents 73a443d + 1b2c57c commit 4064e97

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

CONTRIBUTING.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@ to be run inside the `rust` directory):
262262
2. Checkout the commit from the latest available nightly. You can get it using `rustup check`.
263263
3. Sync the changes to the rust-copy of Clippy to your Clippy fork:
264264
```bash
265-
# Make sure to change `your-github-name` to your github name in the following command
265+
# Make sure to change `your-github-name` to your github name in the following command. Also be
266+
# sure to either use a net-new branch, e.g. `sync-from-rust`, or delete the branch beforehand
267+
# because changes cannot be fast forwarded
266268
git subtree push -P src/tools/clippy [email protected]:your-github-name/rust-clippy sync-from-rust
267269
```
268270

0 commit comments

Comments
 (0)