Merge branch 'dev'

niuiic · Apr 23, 2024 · 33d911d · 33d911d
2 parents 74d5579 + 59b4f31
commit 33d911d
Showing 1 changed file with 26 additions and 0 deletions.
diff --git a/.git-flow.toml b/.git-flow.toml
@@ -0,0 +1,26 @@
+[[branch_types]]
+name = "feature"
+create = "feature/{NAME}"
+from = "dev"
+to = [{ name = "dev", strategy = "merge" }]
+
+[[branch_types]]
+name = "hotfix"
+create = "hotfix/{NAME}"
+from = "main"
+to = [
+  { name = "main", strategy = "merge" },
+  { name = "dev", strategy = "merge" },
+]
+
+[[branch_types]]
+name = "bugfix"
+create = "bugfix/{NAME}"
+from = "dev"
+to = [{ name = "dev", strategy = "merge" }]
+
+[[branch_types]]
+name = "release"
+create = "release/{NAME}"
+from = "dev"
+to = [{ name = "main", strategy = "merge" }]