git-branching-strategy

What problem does it solve?

This skill helps teams prevent monster branches by enforcing disciplined branching practices, ensuring that each feature lives in its own focused branch and is easy to review, test, and merge.

Core Features & Use Cases

• One-feature-one-branch rule: keep changes isolated to a single feature.
• Branch size guidelines: recommended commit counts and file scope to keep branches manageable.
• Naming and workflow guidance: conventional prefixes (feat/, fix/, refactor/), merge readiness checks, and when to split work.
• Pre-Implementation Checklist: ensures the feature scope is well-defined before writing code.

Quick Start

From the start of a feature, prepare your environment and create a focused branch: git checkout main git pull origin main git checkout -b feat/your-feature

As work progresses, keep to a single feature per branch and review changes before merging. When complete, rebase onto main and merge with a no-ff option: git fetch origin git rebase origin/main git checkout main git merge --no-ff feat/your-feature git push origin main

If the work expands to multiple unrelated tasks, create a new branch for each task (feat/, fix/, refactor/) and keep commits focused.