Gitflow branching strategy

gitflow.md

---
config:
  gitGraph:
    parallelCommits: false
    showCommitLabel: false
---
gitGraph TB:
    commit tag: "1.0.0"
    branch hotfix order: 2
    branch develop order: 4
    checkout develop
    commit id: ""
    branch feature-1 order: 5
    branch feature-2 order: 6
    branch feature-3 order: 7
    checkout feature-1
    commit
    commit
    checkout feature-3
    commit
    checkout feature-2
    commit
    checkout hotfix
    commit
    checkout feature-1
    commit
    checkout main
    merge hotfix tag: "1.0.1"
    checkout develop
    merge hotfix 
    checkout feature-1
    merge develop
    commit
    checkout develop
    merge feature-1
    checkout develop
    commit
    branch release order: 3
    checkout release
    commit
    commit
    checkout develop
    merge release 
    checkout release
    commit type: HIGHLIGHT
    checkout develop
    merge release type: HIGHLIGHT
    checkout main
    merge release tag: "1.1.0"
    checkout feature-2
    merge develop
    checkout feature-3
    merge develop
    checkout main

Loading

See the code in the Live Mermaid editor below.¹

Footnotes

1. https://mermaid.live/edit?gist=https://gist.github.com/Andygol/1bb88ecff3d4deb3c0df074624fa3c83#pako:eNqNVMtugzAQ_BVrzwTZkPDwsa3UVuoxp4qLAxtABYwc01eUfy-POA9EaA5IeGd2dvAY7yGWCQKHxWIRVbGstnnKo4qQNNfPStRZvyCkFkoUBRaPsixzveNkK4odDtguk19D_U1ssDhhvaTRIeuHo1TcU4kWKScRMJvaNIIB2ihRxRnJpN7m30SqBBUnzhWW4CcWsjbg8qiZYfwhG23gq0l50g0azdii0I3CBTNKq0nYMbA3CbsG9kc-TvKXTibex3z3Do4zwxm27g4RNsMpRV4NpRJViiaPi8SY2c3pjb9qmzcwUCdi-19__CkzZ-AqPIUFih2a6NxR-xG-M7gJX0b_f12if2rk5OX1-eWtfdb3a883jgM8dZkE2fmfu3W8poK5cVrnqJ0VsCBVeQJcqwYtaOlttV3CviNHoDMsMYLOWiLUR-fs0PbUonqXsjRtSjZpBry_XCxo6kRofMpFqsSZglUb6aNsKg3ccVmvAXwP38CZz-xgGVDmeizw2Yp5Fvy0LGr7wTL0qes7lNHAOVjw20-ldhB6nuOtQtcPqRO67PAHc7WsQQ ↩