Changes between Version 87 and Version 88 of HowToGit

Timestamp:

Apr 8, 2020, 5:53:31 AM (4 years ago)

Author:

wenzeslaus

Comment:

Add warnings, details and fork to the Made a mess

HowToGit

@@ -287 +287 @@
 
 This last steps will fail if somebody else did backport after you did the rebase step above. If that's the case, just update your local branch again with the same //git rebase// command as before.
-=== Made a mess? Fix it ===
-
-Example: mess happened on releasebranch_7_8:
-
-{{{
-git reset --hard upstream/releasebranch_7_8 
-git pull upstream releasebranch_7_8 --rebase
-
-# now all should be clean again
-}}}
-
+=== Made a mess? ===
+
+If you made a mess in the upstream repo (the OSGeo repo) or you think you did, consult on grass-dev mailing list.
+
+If you have something you don't like in your local branch or in the branch in your fork, you can trash any changes you made and replace your branch with whatever is in the upstream repo.
+
+Make sure you don't have any local changes or changes on the branch in your fork because this will wipe them out.
+
+Make sure your remotes are set right (see above, origin to your fork and upstream to OSGeo repo):
+
+{{{
+git remote -v
+}}}
+
+Make sure you are on the right branch (here using releasebranch_7_8):
+
+{{{
+git checkout releasebranch_7_8
+}}}
+
+Bring the local branch to the state of the upstream branch trashing all local changes:
+
+{{{
+git reset --hard upstream/releasebranch_7_8
+}}}
+
+Update the local repo from the upstream:
+
+{{{
+git fetch --all --prune
+git rebase upstream/releasebranch_7_8
+}}}
+
+If you want to keep the branch in your fork up to date, you may need to also overwrite anything which is on that branch there. Be sure you are force pushing only to origin and that origin is your fork. Force push the state of the local branch into your fork:
+
+{{{
+git push --force origin releasebranch_7_8
+}}}
 == Code review: generate a single diff for a PR with multiple commits ==