Skip to content

Prefer merge over rebase #549

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 1 commit into from
Nov 17, 2019
Merged

Prefer merge over rebase #549

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pullrequest.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ You should have already :ref:`set up your system <setup>`,
* If someone else added new changesets and you get an error::

git fetch upstream
git rebase upstream/master
git push --force-with-lease origin <branch-name>
git merge upstream/master
git push origin <branch-name>

* Finally go on :samp:`https://github.com/{<your-username>}/cpython`: you will
see a box with the branch you just pushed and a green button that allows
Expand Down