nebari
nebari copied to clipboard
Switch to git-flow
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
This should be the correct one to swap to: https://docs.gitlab.com/ee/topics/gitlab_flow.html#release-branches-with-gitlab-flow
This is the proposed workflow
%%{init: { 'logLevel': 'debug', 'theme': 'base' } }%%
gitGraph
commit tag: "v4.0.4"
branch release/v4.0.5
checkout release/v4.0.5
branch featureA
commit
commit
checkout release/v4.0.5
merge featureA
branch featureB
commit
commit
commit
checkout release/v4.0.5
merge featureB
checkout main
merge release/v4.0.5
commit tag: "v4.0.5"
so instead of having a develop branch and swapping our default branch we have a release/* branch
cc/ @costrouc
waiting for 0.4.5