Changes between Version 51 and Version 52 of HowToGit

Timestamp:

05/29/19 00:24:30 (6 years ago)

Author:

neteler

Comment:

+Fixing bugs in a release branch

HowToGit

@@ -130 +130 @@
 https://lists.osgeo.org/pipermail/grass-dev/2019-May/092653.html
 
+== Fixing bugs in a release branch ==
+
+TODO: verify
+
+To directly fix bugs (ideally via feature branch), do
+
+{{{
+# push to release_branch, we assume it to be checked out
+
+cd releasebranch_7_4/
+# be sure to locally have all updates from server
+git fetch --all
+git branch --merged 
+
+# create feature branch
+git checkout -b r74_fix_xxx
+
+# ... do changes...
+
+git status
+git add ...
+git commit -m 'useful commit msg...'
+
+# 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:
+
+# switch to release branch
+git checkout releasebranch_7_4 
+
+# be sure to locally have all updates
+git fetch --all
+git branch --merged 
+
+git branch -D changelog_fix_msg_74 
+git fetch --all --prune
+git branch -a
+}}}
+
 == Backporting to release branches ==