From 6d04ed4f164ebf23159ae1e9edb9b6782837e71c Mon Sep 17 00:00:00 2001 From: Kevin Bowen Date: Sat, 17 Aug 2024 19:57:59 -0700 Subject: [PATCH 1/5] Improve forking instructions (#1375) --- getting-started/git-boot-camp.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index b5465cdb7..cc0756aaa 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -44,11 +44,14 @@ You will only need to do this once. 1. Go to https://github.com/python/cpython. -2. Press ``Fork`` on the top right. +2. Press ``Fork`` located near the top right of the page. -3. When asked where to fork the repository, choose to fork it to your username. + * The required fields ``Owner`` and ``Repository name`` should already be pre-populated with your username and the original repository name "cpython". + * Uncheck the "Copy the ``main`` branch only" button. -4. Your forked CPython repository will be created at https://github.com//cpython. +3. Press the ``Create fork`` button. + +4. Your forked CPython repository will be created at ``https://github.com//cpython``. .. _clone-your-fork: @@ -105,6 +108,10 @@ To verify the upstream for ``main``:: It should emit ``upstream``, indicating to track/pull changes for ``main`` from the ``upstream`` remote. +Once this is verified, update your local repository with the upstream branches:: + + $ git fetch upstream + .. _set-up-name-email: From c52a1abae60558ea2fcd35a75d7c2be706c8dd6e Mon Sep 17 00:00:00 2001 From: Kevin Bowen Date: Sun, 18 Aug 2024 17:01:59 -0700 Subject: [PATCH 2/5] Update getting-started/git-boot-camp.rst Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- getting-started/git-boot-camp.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index cc0756aaa..b0df0500b 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -108,7 +108,7 @@ To verify the upstream for ``main``:: It should emit ``upstream``, indicating to track/pull changes for ``main`` from the ``upstream`` remote. -Once this is verified, update your local repository with the upstream branches:: +Once this is verified, update your local clone with the upstream branches:: $ git fetch upstream From 669905e45985ecc7fb48efb7f3d58e8ae7adcee3 Mon Sep 17 00:00:00 2001 From: Kevin Bowen Date: Tue, 20 Aug 2024 15:52:26 -0700 Subject: [PATCH 3/5] Update getting-started/git-boot-camp.rst Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- getting-started/git-boot-camp.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index b0df0500b..0982049cf 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -46,7 +46,6 @@ You will only need to do this once. 2. Press ``Fork`` located near the top right of the page. - * The required fields ``Owner`` and ``Repository name`` should already be pre-populated with your username and the original repository name "cpython". * Uncheck the "Copy the ``main`` branch only" button. 3. Press the ``Create fork`` button. From fc4c1243fade9e3b77b9bb701bdac7e736a27009 Mon Sep 17 00:00:00 2001 From: Kevin Bowen Date: Thu, 22 Aug 2024 17:21:49 -0700 Subject: [PATCH 4/5] Update getting-started/git-boot-camp.rst Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- getting-started/git-boot-camp.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 0982049cf..9af7a7845 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -46,7 +46,7 @@ You will only need to do this once. 2. Press ``Fork`` located near the top right of the page. - * Uncheck the "Copy the ``main`` branch only" button. +4. Uncheck the "Copy the ``main`` branch only" button. 3. Press the ``Create fork`` button. From ac5a0d82e7ff99fa8b89d0b2e1405f12a5057708 Mon Sep 17 00:00:00 2001 From: Kevin Bowen Date: Thu, 22 Aug 2024 17:28:27 -0700 Subject: [PATCH 5/5] Adjust numbering of forking instructions --- getting-started/git-boot-camp.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 9af7a7845..c857f688e 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -46,11 +46,11 @@ You will only need to do this once. 2. Press ``Fork`` located near the top right of the page. -4. Uncheck the "Copy the ``main`` branch only" button. +3. Uncheck the "Copy the ``main`` branch only" button. -3. Press the ``Create fork`` button. +4. Press the ``Create fork`` button. -4. Your forked CPython repository will be created at ``https://github.com//cpython``. +5. Your forked CPython repository will be created at ``https://github.com//cpython``. .. _clone-your-fork: