Skip to content

Commit bc37079

Browse files
E-PaineMariatta
andauthored
Improve instruction for updating with upstream (#646)
Co-authored-by: Mariatta <Mariatta@users.noreply.github.com>
1 parent b6d8676 commit bc37079

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

gitbootcamp.rst

+9-2
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@ Creating a Pull Request
237237

238238
6. Press the ``Create pull request`` button.
239239

240-
Syncing with Upstream
241-
---------------------
240+
Updating your CPython Fork
241+
--------------------------
242242

243243
Scenario:
244244

@@ -249,12 +249,19 @@ Scenario:
249249
- You now want to update your forked CPython repository to be the same as
250250
the upstream CPython repository.
251251

252+
Please do not try to solve this by creating a pull request from
253+
``python:master`` to ``<username>:master`` as the authors of the patches will
254+
get notified unnecessarily.
255+
252256
Solution::
253257

254258
git checkout master
255259
git pull upstream master
256260
git push origin master
257261

262+
.. note:: For the above commands to work, please follow the instructions found
263+
in the :ref:`checkout` section
264+
258265
Another scenario:
259266

260267
- You created ``some-branch`` some time ago.

0 commit comments

Comments
 (0)