Skip to content

Commit 43615a5

Browse files
methanewillingc
authored andcommitted
stop recommend rebase for new contributors (#496)
* stop recommend rebase for new contributors We should not recommend "rebase" and "push -f" to new users. * fix English and rest syntax
1 parent aa0828f commit 43615a5

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

gitbootcamp.rst

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,9 @@ Scenario:
241241
Solution::
242242

243243
git checkout master
244-
git pull --rebase upstream master
244+
git pull upstream master
245245
git push origin master
246246

247-
The ``--rebase`` option is only needed if you have local changes to the
248-
branch.
249-
250247
Another scenario:
251248

252249
- You created ``some-branch`` some time ago.
@@ -259,8 +256,16 @@ Solution::
259256

260257
git checkout some-branch
261258
git fetch upstream
262-
git rebase upstream/master
263-
git push --force origin some-branch
259+
git merge upstream/master
260+
git push origin some-branch
261+
262+
You may see error messages like "CONFLICT" and "Automatic merge failed;" when
263+
you run ``git merge upstream/master``.
264+
265+
When it happens, you need to resolve conflict. See these articles about resolving conflicts:
266+
267+
* `About merge conflicts <https://help.github.com/en/articles/about-merge-conflicts>`_
268+
* `Resolving a merge conflict using the command line <https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line>`_
264269

265270

266271
.. _git_from_mercurial:

0 commit comments

Comments
 (0)