Changes between Version 86 and Version 87 of HowToGit

Timestamp:

04/08/20 05:41:26 (5 years ago)

Author:

wenzeslaus

Comment:

Replace git merge with git rebase. Drop the merging a merge commit instruction. Add recovery from outdated repo. Change structure to text and single commands..

HowToGit

@@ -234 +234 @@
 === Backporting of a single commit from master to release branch ===
 
-... we are in releasebranch_7_8 branch:
-
-{{{
-# assumptions:
-# - the own fork is defined as "origin"
-# - the remote repo is defined as "upstream"
-
-# 1. update the local copy and fork to state of remote repo
+Assumptions:
+* Your own fork is defined as "origin".
+* The OSGeo repo is defined as "upstream".
+* Using releasebranch_7_8 branch in the examples as the branch to backport to.
+
+First, before you do the //git cherry-pick//, update the local repo and fork to state of upstream with the following four steps.
+
+Get latest changes to your machine:
+
+{{{
 git fetch --all --prune
+}}}
+
+Go to the branch:
+
+{{{
 git checkout releasebranch_7_8
-git merge upstream/releasebranch_7_8
+}}}
+
+Update the local branch with latest changes from upstream:
+
+{{{
+git rebase upstream/releasebranch_7_8
+}}}
+
+Update your the branch in your fork (optional, just to keep things organized):
+
+{{{
 git push origin releasebranch_7_8
-
-
-# 2. get hash from GitHub or git log in master
-
-# 3. cherry-pick the change from master into releasebranch branch
+}}}
+
+Second, get commit hash from !GitHub or //git log// in master.
+
+Third, cherry-pick the change from master into the branch:
+
+{{{
 git cherry-pick <hash>
-
-#(or
-#git cherry-pick -m1 hash
-#when cherry picking a merge request)
-
-# verify
+}}}
+
+Forth, verify:
+{{{
+git status
+git log
 git show
-
-# push backport to releasebranch upstream
+}}}
+
+Fifth, push backport to the branch in upstream:
+
+{{{
 git push upstream releasebranch_7_8
 }}}
 
-
+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 ===