Changes between Version 65 and Version 66 of HowToGit

Timestamp:

Jul 31, 2019, 4:02:21 PM (5 years ago)

Author:

hcho

Comment:

git merge should be done into the same local branch; otherwise, getting a lot of conflicts in and contaminating the master branch

HowToGit

@@ -53 +53 @@
 # merge updates into local master
 git merge upstream/master
+
 # at this point we have reached:
 # (HEAD -> master, upstream/master)
 
 ### b) updating releasebranch_7_6
-# merge updates into local master
+# switch to branch
+# only once
+git checkout -b releasebranch_7_6 origin/releasebranch_7_6
+# next time, git checkout releasebranch_7_6
+
+# merge updates into local branch
 git merge upstream/releasebranch_7_6
+
 # at this point we have reached:
 # (HEAD -> releasebranch_7_6, upstream/releasebranch_7_6)
@@ -146 +153 @@
 git push origin
 }}}
+
 == Switching between branches ==
 
@@ -197 +205 @@
 git branch -a
 }}}
+
 == Backporting to release branches ==
 
@@ -209 +218 @@
 }}}
 
-
 === Backporting of a single commit ===
 
@@ -218 +226 @@
 # update master to fetch the commit to be backported
 git fetch --all --prune 
+
+# ??? With git log, identify the sha1sum of the commit you want to backport (example: backport into releasebranch_7_6)
+git log
 
 # Note: only needed if you have your fork as "origin" (see above)
 # update local repo 
 ## NO git pull origin releasebranch_7_6 --rebase
-# merge updates into local master
+
+# switch to branch
+git checkout releasebranch_7_6
+
+# merge updates into local releasebranch_7_6
 git merge upstream/releasebranch_7_6
+
 # at this point we have reached:
 # (HEAD -> master, upstream/releasebranch_7_6, releasebranch_7_6)
@@ -230 +246 @@
 git push origin releasebranch_7_6
 
-# ??? With git log, identify the sha1sum of the commit you want to backport (example: backport into releasebranch_7_6)
-git log
-
-# switch to branch
-git checkout releasebranch_7_6
-
 # now backport the commit (edit conflicts if needed)
 git cherry-pick the_sha1_sum