File tree 1 file changed +11
-6
lines changed
1 file changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -241,12 +241,9 @@ Scenario:
241
241
Solution::
242
242
243
243
git checkout master
244
- git pull --rebase upstream master
244
+ git pull upstream master
245
245
git push origin master
246
246
247
- The ``--rebase `` option is only needed if you have local changes to the
248
- branch.
249
-
250
247
Another scenario:
251
248
252
249
- You created ``some-branch `` some time ago.
@@ -259,8 +256,16 @@ Solution::
259
256
260
257
git checkout some-branch
261
258
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 >`_
264
269
265
270
266
271
.. _git_from_mercurial :
You can’t perform that action at this time.
0 commit comments