711 B
711 B
Workflow
Branch policy
Protected branches:
- main
- develop
Normal task flow:
- checkout develop
- create feature/
- implement the task
- commit changes
- merge feature branch into develop
- delete feature branch when appropriate
When to use an umbrella branch
Use an umbrella branch only for a large coordinated effort that spans multiple dependent feature branches.
If used, document:
- why it exists
- its exact name
- which child branches merge into it
- when it is expected to merge back into develop
Task discipline
Each task should:
- have one clear goal
- have one task branch
- end with a commit and merge target confirmation
- not silently include unrelated cleanup