Changes between Version 89 and Version 90 of HowToGit

Timestamp:

Apr 9, 2020, 6:36:30 AM (4 years ago)

Author:

wenzeslaus

Comment:

Section about rebasing PR with details on strange messages and commands

HowToGit

@@ -133 +133 @@
 Continue do your changes and commit/push them (ideally to a feature branch, see above).
 
-
+==== Updating your PR from master ====
+
+Updating your PR from master is often referred to as rebasing a PR. It comes into play in case there are
+changes in master you need to incorporate into your (feature or fix) branch before the PR can be merged, you need to rebase your branch to upstream:
+
+{{{
+git fetch upstream
+git rebase upstream/master
+git status
+}}}
+
+Now the //git status// will tell you that your local branch and the branch in origin (which is your fork) have diverged:
+
+{{{
+Your branch and 'origin/fix-window-size' have diverged,
+and have 7 and 5 different commits each, respectively.
+}}}
+
+If you try to push to your fork (origin), you will get rejected:
+
+{{{
+ ! [rejected]  fix-window-size -> fix-window-size (non-fast-forward)
+error: failed to push some refs to 'https://...'
+hint: Updates were rejected because the tip of your current branch is behind
+}}}
+
+Besides the provided information, both of the messages above will also suggest you to use //git pull// to update. That's not what you want to do (at least not with the default settings of //git pull// which does merge).
+
+As //git status// says, there are different commits in each branch (the local one and the one in your fork). That's because //git rebase// changed hashes and dates of the existing commits in your local branch (because it reapplies the changes as new commits on top of the up-to-date upstream). The commits on the branch in your fork don't actually contain anything you don't have, so you can safely discard them. You can confirm this by looking at //git log// locally and looking at the branch in your fork on !GitHub.
+
+To push into the branch in the fork, you will need to overwrite what is already there, i.e., replace the branch in the fork by content in your local branch. This is done using force push:
+
+{{{
+git push --force origin fix-window-size
+}}}
+
+If you have access to one of the OSGeo repositories (namelly OSGeo/grass in this case), before force pushing, you need be sure that origin points to your fork and not the OSGeo repo. You can check that using `git remote -v`.
 == Switching between branches ==