Skip to content
Snippets Groups Projects

allow for hotfixes

Merged Marco Wettstein requested to merge f/hotfixes into master
Files
2
+ 2
2
@@ -68,11 +68,11 @@ So we want to have a new patched version 2.4.4 that will be our new prod :
- create a branch for the hotfix: `git checkout -b 2.4.x v2.4.3
- do your fixes and commit with a `fix:` commit: `fix: very important bug to hotfix`
- push this branch to gitlab and create a Merge Request into master
- push this branch to gitlab
- this will now trigger a special pipeline where you have your usuall lint/test/build and review deploy.
- Additionaly this pipeline contains a "create-release"-step. Run this job to create the new hotfix release 2.4.4.
- this will in turn run a pipeline that let's you deploy it to prod and stage. its not done automatically. Chose the right destination for your hotfix.
- merge the MR into master to also apply it to master. But make sure to NOT delete the branch
- pull the branch again locally (if you want to have it in the changelog file) and merge it into master
- this might lead to conflicts now if the hotfix no longer applies, but that's ok! Maybe it was already fixed in some stage feature.
### enable staging
Loading