Skip to content

Syncing with Upstream more accessible (issue #645) #646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2020
Merged

Syncing with Upstream more accessible (issue #645) #646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2ae26c
Syncing with Upstream more accessible
E-Paine Dec 1, 2020
fe246f1
Minor rephrasing suggested by @Mariatta
E-Paine Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions gitbootcamp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ Creating a Pull Request

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

Syncing with Upstream
---------------------
Updating your CPython Fork
--------------------------

Scenario:

Expand All @@ -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 ``<username>:master`` as the authors of the patches will
get notified unnecessarily.

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.
Expand Down