diff --git a/pullrequest.rst b/pullrequest.rst index cdeab54b3..0cd00253a 100644 --- a/pullrequest.rst +++ b/pullrequest.rst @@ -97,8 +97,8 @@ You should have already :ref:`set up your system `, * If someone else added new changesets and you get an error:: git fetch upstream - git rebase upstream/master - git push --force-with-lease origin + git merge upstream/master + git push origin * Finally go on :samp:`https://github.com/{}/cpython`: you will see a box with the branch you just pushed and a green button that allows