git-flow
Installation
SKILL.md
Git Flow Strategy
When to Use
- Deciding which branch to base work on.
- Creating a new Release or Hotfix.
- Merging strategies (Squash vs Merge Commit).
1. Branching Model
| Branch | Source | Merge Into | Lifespan | Purpose |
|---|---|---|---|---|
main |
- | - | Infinite | Production-ready code. Stable. |
develop |
main |
main |
Infinite | Integration branch for next release. |
feature/* |
develop |
develop |
Short | New features (e.g., feature/login-page). |
release/* |
develop |
develop, main |
Medium | Release prep (e.g., release/v1.0.0). |
hotfix/* |
main |
develop, main |
Very Short | Production critical fixes (e.g., hotfix/crash). |