git-agentic-branching-strategy

What problem does it solve?

This skill provides a structured, repeatable Git branching framework for agentic Lighthouse LM projects, helping teams decide when to create epic, feature, wave, or hotfix branches and how to merge between them.

Core Features & Use Cases

• Guided branching decisions: Determine the appropriate branch type (epic, feature, wave, hotfix) based on work type, scope, and timelines.
• Consistent workflows: Prescribe where to create branches from (development, epic, or feature) and when to commit waves directly vs. via dedicated branches.
• Practical examples: Illustrates multi-feature epics, standalone waves, and standalone features with expected merge targets and sample commands.

Quick Start

To start, ask: "I have an Epic 1 with 3 features and 2 waves per feature. What should I branch?" Then follow these steps:

• Create the epic branch from development:
  • git checkout development
  • git pull origin development
  • git checkout -b epic-1-progressive-coherence
  • git push -u origin epic-1-progressive-coherence
• Create a feature branch from the epic for a given feature:
  • git checkout epic-1-progressive-coherence
  • git checkout -b feature-1.10-infrastructure epic-1-progressive-coherence
  • git push -u origin feature-1.10-infrastructure
• Implement waves as commits on the feature branch:
  • git add .
  • git commit -m "feat(wave-1.10.1): Implement catalog change monitor"
  • git push
• After all waves for a feature complete, merge feature → epic:
  • gh pr create --base epic-1-progressive-coherence --head feature-1.10-infrastructure
• Then merge epic → development when all features finish:
  • gh pr create --base development --head epic-1-progressive-coherence