Changes between Version 84 and Version 85 of HowToGit

Timestamp:

Feb 17, 2020, 4:30:10 AM (4 years ago)

Author:

neteler

Comment:

improve backport procedure

HowToGit

@@ -232 +232 @@
 === Backporting of a single commit from master to release branch ===
 
-... assumming that we are in releasebranch_7_8 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
 git fetch --all --prune
-git rebase upstream/releasebranch_7_8
-# get hash from GitHub or git log in master
+git checkout releasebranch_7_8
+git merge upstream/releasebranch_7_8
+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
 git cherry-pick <hash>
 
@@ -247 +258 @@
 git show
 
-# push backport to upstream
+# push backport to releasebranch upstream
 git push upstream releasebranch_7_8
 }}}