Replace git flow with GitLab Flow
Tested a few things out and this article turns out to have the best approach.
The script gen-semver is based on Python and either outputs the latest version/tag if nothing got committed since. If the current branch has commits since the last tag, the version gets bumped. What's missing so far: a decision tree what to bump, patch, minor or major.
The idea for us:
-
main is always the production branch, it's protected so that pushing is disallowed, only merging is allowed -
develop is the general working branch -
feature branches (i.e. stages) can always be created -
downstream merging (from feature to develop or from develop to main) is always possible -
when merging into main, a new version/tag will be created