Skip to content

stop recommend rebase for new contributors #496

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 2 commits into from
Jun 16, 2019
Merged

stop recommend rebase for new contributors #496

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76a77d6
stop recommend rebase for new contributors
methane Jun 13, 2019
83e1741
fix English and rest syntax
methane Jun 14, 2019
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
17 changes: 11 additions & 6 deletions gitbootcamp.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down