File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ ## Branching Strategy
2+
3+ This project follows a structured Git branching model:
4+
5+ - ` main ` → Production environment
6+ - ` develop ` → Staging / integration environment
7+ - ` feature/* ` → Feature development branches
8+
9+ ### Workflow
10+
11+ 1 . Developer creates a feature branch from ` develop `
12+ 2 . Feature is implemented and pushed
13+ 3 . Pull Request is created to ` develop `
14+ 4 . CI pipeline validates build and container health
15+ 5 . After approval, feature is merged into ` develop `
16+ 6 . Release Pull Request is created from ` develop ` to ` main `
17+ 7 . On merge to ` main ` , production deployment is triggered
18+
19+ ### Conflict Resolution Approach
20+
21+ Before merging, the feature branch is rebased or merged with latest ` develop ` branch.
22+ Conflicts are resolved locally, tested again, and then pushed.
23+
24+ ### Branch Protection Strategy
25+
26+ Even though GitHub free plan does not enforce strict protection:
27+
28+ - Direct push to ` main ` is avoided
29+ - Pull Request approval is required
30+ - CI pipeline must pass before merge
31+ - Feature branches are short-lived
You can’t perform that action at this time.
0 commit comments