# Git Branching Flow

> Choosing and implementing the right collaboration strategy for your team's development speed.

- Skill: `jcorpac/git-branching-flow` (Agent Skill)
- Install (CLI): `npx skillmds@latest add jcorpac/git-branching-flow`
- Raw SKILL.md: https://api.skillmd.com/api/skills/jcorpac/git-branching-flow/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: jcorpac (https://skillmd.com/u/jcorpac)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/jcorpac/git-branching-flow

---


# Git Branching Flow

How your team branches determines how quickly and safely you can release software.

## Strategy 1: Trunk-Based Development
- **Workflow**: All developers commit to a single `main` branch multiple times a day.
- **Best For**: High-performing teams with robust CI/CD and automated testing.
- **Pros**: Reduces merge hell; moves faster.

## Strategy 2: Feature Branching (Gitflow-lite)
- **Workflow**: Create a branch for every feature or bug fix. Merge via Pull Request.
- **Best For**: Teams requiring formal code reviews or working on complex, long-running features.
- **Pros**: Protects the `main` branch; provides clear audit trails.

## Best Practices
- **Short-Lived Branches**: Features should be merged within 1-3 days.
- **Delete Merged Branches**: Keep the repository clean by removing branches once integrated.
- **Up-to-Date**: Regularly merge or rebase the target branch into your feature branch to stay current.