nebari icon indicating copy to clipboard operation
nebari copied to clipboard

Switch to git-flow

Open iameskild opened this issue 3 years ago • 2 comments

https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

iameskild avatar Aug 16 '22 15:08 iameskild

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

trallard avatar Aug 31 '22 10:08 trallard

waiting for 0.4.5

trallard avatar Oct 07 '22 17:10 trallard