From 76a77d6f2171d8980c9315a00571c2c1daa3e7b5 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Thu, 13 Jun 2019 20:16:11 +0900 Subject: [PATCH 1/2] stop recommend rebase for new contributors We should not recommend "rebase" and "push -f" to new users. --- gitbootcamp.rst | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/gitbootcamp.rst b/gitbootcamp.rst index 9136143f9..c915e3e8c 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,17 @@ 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 following articles for +how to resolve 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: From 83e174186edff1448b52f305623002665de60e60 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Fri, 14 Jun 2019 19:23:47 +0900 Subject: [PATCH 2/2] fix English and rest syntax --- gitbootcamp.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gitbootcamp.rst b/gitbootcamp.rst index c915e3e8c..0aafe9963 100644 --- a/gitbootcamp.rst +++ b/gitbootcamp.rst @@ -262,11 +262,10 @@ Solution:: 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 following articles for -how to resolve conflicts. +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) +* `About merge conflicts `_ +* `Resolving a merge conflict using the command line `_ .. _git_from_mercurial: