From d2ae26c935979e7e4ef48220ad56cd7ac8f509b6 Mon Sep 17 00:00:00 2001 From: "E. Paine" <63801254+E-Paine@users.noreply.github.com> Date: Tue, 1 Dec 2020 18:57:06 +0000 Subject: [PATCH 1/2] Syncing with Upstream more accessible --- gitbootcamp.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gitbootcamp.rst b/gitbootcamp.rst index 7a8405a22b..76e5a4915e 100644 --- a/gitbootcamp.rst +++ b/gitbootcamp.rst @@ -237,8 +237,8 @@ Creating a Pull Request 6. Press the ``Create pull request`` button. -Syncing with Upstream ---------------------- +Updating your CPython Fork +-------------------------- Scenario: @@ -249,12 +249,19 @@ Scenario: - You now want to update your forked CPython repository to be the same as the upstream CPython repository. +Please do not try to solve this by creating a pull request from +``python:master`` to ``:master`` as the authors of the patches will +get notified (and you will end up embarrassed!). + Solution:: git checkout master git pull upstream master git push origin master +.. note:: For the above commands to work, please follow the instructions found + in the :ref:`checkout` section + Another scenario: - You created ``some-branch`` some time ago. From fe246f17f554e2affe0d05c0ef568a14544980c6 Mon Sep 17 00:00:00 2001 From: E-Paine <63801254+E-Paine@users.noreply.github.com> Date: Tue, 1 Dec 2020 19:25:32 +0000 Subject: [PATCH 2/2] Minor rephrasing suggested by @Mariatta Co-authored-by: Mariatta --- gitbootcamp.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitbootcamp.rst b/gitbootcamp.rst index 76e5a4915e..bd5f8e441f 100644 --- a/gitbootcamp.rst +++ b/gitbootcamp.rst @@ -251,7 +251,7 @@ Scenario: Please do not try to solve this by creating a pull request from ``python:master`` to ``:master`` as the authors of the patches will -get notified (and you will end up embarrassed!). +get notified unnecessarily. Solution::