development #95
@@ -33,10 +33,7 @@ make ci # Run all checks
|
|||||||
1. Create feature branch FROM `development`: `git checkout -b feature/{sprint}-{description}`
|
1. Create feature branch FROM `development`: `git checkout -b feature/{sprint}-{description}`
|
||||||
2. Work and commit on feature branch
|
2. Work and commit on feature branch
|
||||||
3. Merge INTO `development` when complete
|
3. Merge INTO `development` when complete
|
||||||
4. Delete the feature branch after merge (keep branches clean)
|
4. `development` -> `staging` -> `main` for releases
|
||||||
5. `development` -> `staging` -> `main` for releases
|
|
||||||
|
|
||||||
**CRITICAL: NEVER DELETE the `development` branch. It is the main integration branch.**
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user