git-storytelling-branch-strategy

# Git Storytelling - Branch Strategy

This skill helps you implement effective branching strategies that tell the story of your development process through organized, purposeful branch management. Good branching creates a clear narrative of parallel development efforts.

## Core Concepts

### Why Branch Strategy Matters

A good branching strategy:

- **Creates clear development narratives** - Each branch tells a specific story
- **Enables parallel work** - Multiple features can develop simultaneously
- **Facilitates code review** - Changes are isolated and reviewable
- **Supports deployment workflows** - Different branches for different environments
- **Reduces merge conflicts** - Smaller, focused branches are easier to merge
- **Documents development history** - Branch names and structure show intent

### The Story of Branches

Think of branches as parallel storylines in your codebase:

- **Main branch**: The canonical story, always working and deployable
- **Feature branches**: Side quests that eventually merge into the main story
- **Release branches**: Chapters being prepared for publication
- **Hotfix branches**: Emergency patches to the published story
- **Development branch**: The staging area where stories come together

## Branch Naming Conventions

### Standard Prefixes

Use consistent prefixes to categorize branches:

```
feature/    - New features
fix/        - Bug fixes
hotfix/     - Production emergency fixes
refactor/   - Code refactoring
test/       - Testing changes
docs/       - Documentation
chore/      - Maintenance tasks
release/    - Release preparation
```

### Naming Best Practices

Good branch names are:

```bash
# GOOD: Clear, descriptive, kebab-case
feature/user-authentication
fix/payment-processing-timeout
refactor/extract-validation-logic
hotfix/critical-security-patch

# BAD: Vague, unclear, inconsistent
feature/new-stuff
fix-thing
my-branch
temp
```

### Including Issue Numbers

Reference tracking system issues:

```bash
feature/123-ad