@@ -5,19 +5,18 @@ graph TD
55 dify[Dify]
66 smolagents[Smolagents]
77
8- %% StrandForge Organization Branches
8+ %% StrandForge Branches
99 base_main[base-main]
1010 develop[develop]
1111 feature_visual_builder[feature/visual-builder]
1212 feature_k8s_operator[feature/k8s-operator]
1313 feature_mcp_enhancements[feature/mcp-enhancements]
1414 release_v1[release/v1.0.0]
15- main[main]
1615 hotfix_urgent_bug[hotfix/urgent-bug]
1716
1817 %% Upstream sync and feature integration
1918 upstream_main -->|Daily Sync| base_main
20- base_main -->|Merge Features | develop
19+ base_main -->|Create Feature Branch | develop
2120 dify -->|Frontend Integration| feature_visual_builder
2221 smolagents -->|Feature Integration| feature_k8s_operator
2322
@@ -26,15 +25,19 @@ graph TD
2625 develop --> feature_k8s_operator
2726 develop --> feature_mcp_enhancements
2827
29- %% Merge feature branches back to develop
28+ %% Merge features to develop
3029 feature_visual_builder -->|PR Merge| develop
3130 feature_k8s_operator -->|PR Merge| develop
3231 feature_mcp_enhancements -->|PR Merge| develop
3332
34- %% Release and hotfix flow
35- develop --> release_v1
36- release_v1 -->|Tag| main
37- main --> hotfix_urgent_bug
38- hotfix_urgent_bug -->|PR Merge| main
33+ %% Release flow
34+ base_main -->|Cut Release| release_v1
35+ develop -->|Merge Features| release_v1
36+ release_v1 -->|Test & Tag| v1.0.0
37+ release_v1 -->|Final Merge| base_main
38+
39+ %% Hotfix flow
40+ v1.0.0 -->|Discover Bug| hotfix_urgent_bug
41+ hotfix_urgent_bug -->|PR Merge| base_main
3942 hotfix_urgent_bug -->|Cherry-pick| develop
4043```
0 commit comments