Differences

This shows you the differences between two versions of the page.

--- for_developers:bugfixprocess [2019/01/31 17:19] – Created kunz
+++ for_developers:bugfixprocess [2020/06/26 14:52] (current) – [7. Merge the bug fix into the newer release branches] kunz
@@ Line 1: / Line 1: @@
 ====== Bug Fix Release Process ======
-**NOTE : This process is in its early stage and not yet tested.**
 The following is a step-by-step procedure for creating a bug fix release.
@@ Line 65: / Line 63: @@
 <code>
 git add *CHANGELOG.md*
-git commit -m "Bug Fix Release v1.0.0"
+git commit -m "Bug Fix Release v1.0.1"
 git push
 </code>
@@ Line 80: / Line 78: @@
 It is very important, that the right release branch is selected. The form must be completed as shown in the picture below.
-{{:for_developers:release_v1.0.0_github_1.png?nolink|}}
+{{:for_developers:bugfix_release_v1.0.1_github.png?nolink|}}
 Note that the information in the description section is copied from the change log.
@@ Line 87: / Line 85: @@
 ==== 7. Merge the bug fix into the newer release branches  ====
-The bug fix must be applied on all newer releases too. Therefore, the bug fix must be merged upwards through all releases (merge cascade). After each merge, the change log is updated on the corresponding release branch and a release tag created. Basically, the steps 5 and 6 must be executed.
+The bug fix must be applied on all newer releases and finally on the master branch too. Therefore, the bug fix must be merged upwards through all releases (merge cascade). After each merge, the change log is updated on the corresponding release branch and a release tag created. Basically, the steps 5 and 6 must be executed.
 The following git commands show the procedure for one cascade. It must be repeated.