|
1 | 1 | graph TD |
2 | | - subgraph External Repositories |
3 | | - U[Strands Agents<br/>upstream/main] -->|Daily Sync| B |
4 | | - D[Dify] -->|Frontend Integration| F1 |
5 | | - S[Smolagents] -->|Feature Integration| F2 |
6 | | - end |
| 2 | + %% External Repositories |
| 3 | + upstream_main[Strands Agents upstream-main] |
| 4 | + dify[Dify] |
| 5 | + smolagents[Smolagents] |
7 | 6 |
|
8 | | - subgraph StrandForge Organization |
9 | | - B[base-main] -->|Merge Features| D |
10 | | - D[develop] --> F1[feature/visual-builder] |
11 | | - D --> F2[feature/k8s-operator] |
12 | | - D --> F3[feature/mcp-enhancements] |
13 | | - F1 -->|PR| D |
14 | | - F2 -->|PR| D |
15 | | - F3 -->|PR| D |
16 | | - D --> R[release/v1.0.0] |
17 | | - R -->|Tag| M[main] |
18 | | - M --> H[hotfix/urgent-bug] |
19 | | - H -->|PR| M |
20 | | - H -->|Cherry-pick| D |
21 | | - end |
| 7 | + %% StrandForge Organization Branches |
| 8 | + base_main[base-main] |
| 9 | + develop[develop] |
| 10 | + feature_visual_builder[feature/visual-builder] |
| 11 | + feature_k8s_operator[feature/k8s-operator] |
| 12 | + feature_mcp_enhancements[feature/mcp-enhancements] |
| 13 | + release_v1[release/v1.0.0] |
| 14 | + main[main] |
| 15 | + hotfix_urgent_bug[hotfix/urgent-bug] |
22 | 16 |
|
23 | | - style U stroke:#0366d6,stroke-width:2px |
24 | | - style B stroke:#22863a,stroke-width:2px |
25 | | - style D stroke:#6f42c1,stroke-width:2px |
26 | | - style F1,F2,F3 stroke:#d73a49,stroke-width:1.5px |
27 | | - style R stroke:#e36209,stroke-width:2px |
28 | | - style M stroke:#005cc5,stroke-width:3px |
| 17 | + %% Upstream sync and feature integration |
| 18 | + upstream_main -->|Daily Sync| base_main |
| 19 | + base_main -->|Merge Features| develop |
| 20 | + dify -->|Frontend Integration| feature_visual_builder |
| 21 | + smolagents -->|Feature Integration| feature_k8s_operator |
| 22 | + |
| 23 | + %% Feature branches from develop |
| 24 | + develop --> feature_visual_builder |
| 25 | + develop --> feature_k8s_operator |
| 26 | + develop --> feature_mcp_enhancements |
| 27 | + |
| 28 | + %% Merge feature branches back to develop |
| 29 | + feature_visual_builder -->|PR Merge| develop |
| 30 | + feature_k8s_operator -->|PR Merge| develop |
| 31 | + feature_mcp_enhancements -->|PR Merge| develop |
| 32 | + |
| 33 | + %% Release and hotfix flow |
| 34 | + develop --> release_v1 |
| 35 | + release_v1 -->|Tag| main |
| 36 | + main --> hotfix_urgent_bug |
| 37 | + hotfix_urgent_bug -->|PR Merge| main |
| 38 | + hotfix_urgent_bug -->|Cherry-pick| develop |
0 commit comments