From 8608047fb217985cd18bc0f045ab1117e7e7c492 Mon Sep 17 00:00:00 2001 From: Gus Wynn Date: Wed, 9 Jun 2021 08:23:36 -0700 Subject: [PATCH] move 7/8 to prose --- src/git.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/git.md b/src/git.md index fb64b3bc..361b65a8 100644 --- a/src/git.md +++ b/src/git.md @@ -70,13 +70,14 @@ and PRs: 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 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). - 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. + 7. [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 +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 the same, with some steps skipped: