diff --git a/gitbootcamp.rst b/gitbootcamp.rst
index 9136143f9..0aafe9963 100644
--- a/gitbootcamp.rst
+++ b/gitbootcamp.rst
@@ -241,12 +241,9 @@ Scenario:
 Solution::
 
    git checkout master
-   git pull --rebase upstream master
+   git pull upstream master
    git push origin master
 
-The ``--rebase`` option is only needed if you have local changes to the
-branch.
-
 Another scenario:
 
 - You created ``some-branch`` some time ago.
@@ -259,8 +256,16 @@ Solution::
 
    git checkout some-branch
    git fetch upstream
-   git rebase upstream/master
-   git push --force origin some-branch
+   git merge upstream/master
+   git push origin some-branch
+
+You may see error messages like "CONFLICT" and "Automatic merge failed;" when
+you run ``git merge upstream/master``.
+
+When it happens, you need to resolve conflict.  See these articles about resolving conflicts:
+
+* `About merge conflicts <https://help.github.com/en/articles/about-merge-conflicts>`_
+* `Resolving a merge conflict using the command line <https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line>`_
 
 
 .. _git_from_mercurial: