mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move 7/8 to prose

This commit is contained in:
Gus Wynn 2021-06-09 08:23:36 -07:00 committed by Joshua Nelson
parent 072657e0a5
commit 8608047fb2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/git.md
View File

@ -70,13 +70,14 @@ and PRs:
6. Push your changes to your fork: `git push --set-upstream origin issue-12345-fix` 6. Push your changes to your fork: `git push --set-upstream origin issue-12345-fix`
(After adding commits, you can use `git push` and after rebasing or (After adding commits, you can use `git push` and after rebasing or
pulling-and-rebasing, you can use `git push --force-with-lease`). pulling-and-rebasing, you can use `git push --force-with-lease`).
7. If you end up needing to rebase and are hitting conflicts, see [Rebasing](#rebasing). 7. [Open a PR][ghpullrequest] from your fork to `rust-lang/rust`'s master branch.
8. If you want to track upstream while working on long-running feature/issue, see
[Keeping things up to date](#keeping-things-up-to-date).
9. [Open a PR][ghpullrequest] from your fork to `rust-lang/rust`'s master branch.
[ghpullrequest]: https://guides.github.com/activities/forking/#making-a-pull-request [ghpullrequest]: https://guides.github.com/activities/forking/#making-a-pull-request
If you end up needing to rebase and are hitting conflicts, see [Rebasing](#rebasing).
If you want to track upstream while working on long-running feature/issue, see
[Keeping things up to date](#keeping-things-up-to-date).
If your reviewer requests changes, the procedure for those changes looks much If your reviewer requests changes, the procedure for those changes looks much
the same, with some steps skipped: the same, with some steps skipped: