Gitflow Workflow
This project follows the Gitflow Workflow for structured branching and release management.
Branches
- main: Production-ready code. Only stable, tested releases.
- develop: Integration branch for features. Reflects the latest development state.
Supporting Branches
-
feature/*:
- Created from:
develop - Purpose: New features
- Merged into:
develop - Naming:
feature/user-login
- Created from:
-
release/*:
- Created from:
develop - Purpose: Prepare for a production release (e.g., version bump, final testing)
- Merged into:
mainanddevelop - Naming:
release/1.0.0
- Created from:
-
hotfix/*:
- Created from:
main - Purpose: Critical fixes to production
- Merged into:
mainanddevelop - Naming:
hotfix/urgent-fix
- Created from:
-
bugfix/* (optional):
- Created from:
develop - Purpose: Fixing non-critical bugs
- Merged into:
develop - Naming:
bugfix/fix-login-error
- Created from:
Pull Request Rules
- All changes go through PRs and must be reviewed.
- CI must pass before merging.
- PR titles follow branch naming conventions.