Merge Changes
After successful review of the applied changes, you have to merge at least one
branch to main.
Branch Overview
Given the original branch setup we started with, the next steps for persisting the changes is illustrated in the following Git graph.
- 2506.0
- 2406.1
Git Steps
Thus, for a major release approval we merge the approval branch and
subsequently the corresponding maintenance branch once to main,
but keep the maintenance branch for later maintenance releases.
For a minor release we just merge approval branch. No changes are applied
to main including no updates done on the documentation (unless, of course,
you need to cherry-pick adaptations to main).
In both scenarios, the release tag will be applied to the maintenance branch only.
Git commands to create the corresponding release tag:
- 2506.0
- 2406.1
git switch "maintenance/2506.x"
git tag "v2506.0.0-1"
git push origin "v2506.0.0-1"
git switch "maintenance/2406.x"
git tag "v2406.1.0-1"
git push origin "v2406.1.0-1"
Automatic Documentation Deployment
As soon as the documentation update is merged, it is deployed to the gh-pages branch.
The corresponding workflows may also be triggered manually at any time within the GitHub Actions.