Changes between Version 66 and Version 67 of HowToGit

Timestamp:

Aug 4, 2019, 3:13:30 AM (5 years ago)

Author:

neteler

Comment:

updated

HowToGit

@@ -166 +166 @@
 == Fixing bugs in a release branch ==
 
-TODO: verify
-
 To directly fix bugs (ideally via feature branch), do
 
+(example: https://github.com/OSGeo/grass/tree/releasebranch_7_8)
+
 {{{
 # push to release_branch, we assume it to be checked out
 
-cd releasebranch_7_4/
+cd releasebranch_78/
 # be sure to locally have all updates from server
 git fetch --all
@@ -179 +179 @@
 
 # create feature branch
-git checkout -b r74_fix_xxx
+git checkout -b r78_fix_xxx
 
 # ... do changes...
@@ -188 +188 @@
 
 # push to feature branch
-git push upstream r74_fix_xxx
-
-# create PR in GitHub UI. IMPORTANT: switch there to release_branch_X_Y!
-
-# ... after review, merge:
-
+git push upstream r78_fix_xxx
+}}}
+
+Now create the PR in !GitHub UI using the link shown by `git push ...` in the terminal.
+
+**IMPORTANT: switch there to release_branch_X_Y!**
+
+After PR positive review, merge PR in !GitHub.
+
+Local cleanup after successful PR merge:
+{{{
 # switch to release branch
-git checkout releasebranch_7_4 
+git checkout releasebranch_7_8
 
 # be sure to locally have all updates
@@ -201 +206 @@
 git branch --merged 
 
-git branch -D changelog_fix_msg_74 
+# delete local feature branch as no longer needed
+git branch -D r78_fix_xxx 
 git fetch --all --prune
 git branch -a