Skip to content
Snippets Groups Projects
Commit 70a1491c authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'dev' into f-boot-tour

parents bfda77b9 35af6e04
No related branches found
No related tags found
2 merge requests!36merge f-boot-tour to dev,!31remove xs
Pipeline #7630 passed with warnings
......@@ -18,10 +18,10 @@ guidelines of the CaosDB Project
2. Check all general prerequisites.
3. Merge the release branch into the master branch.
3. Merge the release branch into the main branch.
4. Tag the latest commit of the master branch with `v<VERSION>`.
4. Tag the latest commit of the main branch with `v<VERSION>`.
5. Delete the release branch.
6. Merge the master branch back into the dev branch.
6. Merge the main branch back into the dev branch.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment