Changes between Version 99 and Version 100 of HowToGit

Timestamp:

Feb 6, 2022, 9:48:54 AM (2 years ago)

Author:

neteler

Comment:

Updated G78 to G80

HowToGit

@@ -57 +57 @@
 git remote add upstream git@github.com:OSGeo/grass-addons.git
 }}}
+
 === Working with Git ===
 
@@ -72 +73 @@
 # (HEAD -> main, upstream/main)
 
-### b) updating releasebranch_7_8
+### b) updating releasebranch_8_0
 # switch to branch
 # only once
-git checkout -b releasebranch_7_8 origin/releasebranch_7_8
-# next time, git checkout releasebranch_7_8
+git checkout -b releasebranch_8_0 origin/releasebranch_8_0
+# next time, git checkout releasebranch_8_0
 
 # merge updates into local branch
-git merge upstream/releasebranch_7_8
+git merge upstream/releasebranch_8_0
 
 # at this point we have reached:
-# (HEAD -> releasebranch_7_8, upstream/releasebranch_7_8)
+# (HEAD -> releasebranch_8_0, upstream/releasebranch_8_0)
 
 # update own remote
@@ -175 +176 @@
 
 If you have access to one of the OSGeo repositories (namely 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 ==
 
@@ -260 +262 @@
 * pr/832
   pr/837
-  releasebranch_7_6
   releasebranch_7_8
+  releasebranch_8_0
 
 # Delete all PRs:
@@ -273 +275 @@
 To directly fix bugs (ideally via feature branch), do
 
-(example: https://github.com/OSGeo/grass/tree/releasebranch_7_8)
+(example: https://github.com/OSGeo/grass/tree/releasebranch_8_0)
 
 {{{
 # push to release_branch, we assume it to be checked out
 
-cd releasebranch_78/
+cd releasebranch_80/
 # be sure to locally have all updates from server
 git fetch --all
@@ -284 +286 @@
 
 # create feature branch
-git checkout -b r78_fix_xxx
+git checkout -b r80_fix_xxx
 
 # ... do changes...
@@ -293 +295 @@
 
 # push to feature branch
-git push upstream r78_fix_xxx
+git push upstream r80_fix_xxx
 }}}
 
@@ -305 +307 @@
 {{{
 # switch to release branch
-git checkout releasebranch_7_8
+git checkout releasebranch_8_0
 
 # be sure to locally have all updates
@@ -312 +314 @@
 
 # delete local feature branch as no longer needed
-git branch -D r78_fix_xxx 
+git branch -D r80_fix_xxx 
 git fetch --all --prune
 git branch -a
@@ -334 +336 @@
 * 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.
+* Using releasebranch_8_0 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.
@@ -347 +349 @@
 
 {{{
-git checkout releasebranch_7_8
+git checkout releasebranch_8_0
 }}}
 
@@ -353 +355 @@
 
 {{{
-git rebase upstream/releasebranch_7_8
+git rebase upstream/releasebranch_8_0
 }}}
 
@@ -359 +361 @@
 
 {{{
-git push origin releasebranch_7_8
+git push origin releasebranch_8_0
 }}}
 
@@ -380 +382 @@
 
 {{{
-git push upstream releasebranch_7_8
+git push upstream releasebranch_8_0
 }}}
 
 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 fetch// and //git rebase// commands as before.
+
 === Made a mess? ===
 
@@ -398 +401 @@
 }}}
 
-Make sure you are on the right branch (here using releasebranch_7_8):
-
-{{{
-git checkout releasebranch_7_8
+Make sure you are on the right branch (here using releasebranch_8_0):
+
+{{{
+git checkout releasebranch_8_0
 }}}
 
@@ -407 +410 @@
 
 {{{
-git reset --hard upstream/releasebranch_7_8
+git reset --hard upstream/releasebranch_8_0
 }}}
 
@@ -414 +417 @@
 {{{
 git fetch --all --prune
-git rebase upstream/releasebranch_7_8
+git rebase upstream/releasebranch_8_0
 }}}
 
@@ -420 +423 @@
 
 {{{
-git push --force origin releasebranch_7_8
+git push --force origin releasebranch_8_0
 }}}