diff --git a/home/branchpolicy.md b/home/branchpolicy.md index 1f66477..326c1fe 100644 --- a/home/branchpolicy.md +++ b/home/branchpolicy.md @@ -1,6 +1,7 @@ --- title: Branch Policy --- + ```mermaid %%{init: { 'logLevel': 'debug', 'theme': 'default' } }%% gitGraph @@ -9,31 +10,31 @@ gitGraph branch dev checkout dev commit id: "init Codebase" - branch dev/feature1 - branch dev/feature2 + branch feature/feature1 + branch feature/feature2 - checkout dev/feature1 + checkout feature/feature1 commit id: "f1-Com1" commit id: "f1-Com2" commit id: "f1-Com3" checkout dev - merge dev/feature1 + merge feature/feature1 - checkout dev/feature2 + checkout feature/feature2 commit id: "f2-Com1" commit id: "f2-Com2" checkout dev - merge dev/feature2 + merge feature/feature2 - branch dev/feature3 - checkout dev/feature3 - commit id: "f3-Com1" - commit id: "f3-Com2" - commit id: "f3-Com3" + branch bugfix/bug1 + checkout bugfix/bug1 + commit id: "bug1-Com1" + commit id: "bug1-Com2" + commit id: "bug1-Com3" checkout dev - merge dev/feature3 + merge bugfix/bug1 checkout main merge dev