From 0791c2e88dbcf262d8e13111f093abca27f7dada Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Thu, 31 Oct 2019 19:48:31 +0900
Subject: [PATCH] Prefer merge over rebase

---
 pullrequest.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 <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