Differences

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

--- for_developers:bugfixprocess [2020/06/26 14:36] – [Bug Fix Release Process] kunz
+++ for_developers:bugfixprocess [2020/06/26 14:52] (current) – [7. Merge the bug fix into the newer release branches] kunz
@@ Line 85: / Line 85: @@
 ==== 7. Merge the bug fix into the newer release branches  ====
-The bug fix must be applied on all newer releases and finally into 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 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.