From 604d447daced75d39643602e8ed648fbbd66f24a Mon Sep 17 00:00:00 2001 From: Nico Koprowski Date: Wed, 10 May 2023 09:38:20 +0200 Subject: [PATCH] docs(branching) add branching strategy diagram to docs --- docs/dev-process/branching-strategy.mmd | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 docs/dev-process/branching-strategy.mmd diff --git a/docs/dev-process/branching-strategy.mmd b/docs/dev-process/branching-strategy.mmd new file mode 100644 index 000000000..38592dc27 --- /dev/null +++ b/docs/dev-process/branching-strategy.mmd @@ -0,0 +1,38 @@ +--- +title: BPDM Branching Strategy +--- +gitGraph + commit + commit + branch "release/1.0.x" + checkout "release/1.0.x" + commit id: "ver(1.0.0)" tag: "1.0.0" + + checkout main + commit id: "ver(0.1.0-SNAPSHOT)" + commit id: "fix(A)" + commit + checkout "release/1.0.x" + branch "fix/1.0.x/A" + cherry-pick id: "fix(A)" + checkout "release/1.0.x" + merge "fix/1.0.x/A" + + checkout "release/1.0.x" + commit id: "ver(1.0.1)" tag: "1.0.1" + checkout main + commit + commit + branch "release/1.1.x" + checkout "release/1.1.x" + commit id: "ver(1.1.0)" tag: "1.1.0" + checkout main + commit id: "ver(1.2.0-SNAPSHOT)" + commit + commit id: "ver(2.0.0-SNAPSHOT)" + branch "feat(B)" + commit id: "feat(B)" + checkout main + branch "fix/C" + commit id: "fix(C)" +