git-agentic-branching-strategy

Determine Git branching strategies for Lighthouse LM agentic projects across epic, feature, development, and main branches.

Updated Jan 19, 2026
One-click install
npx skills add https://github.com/onshoreoutsourcing/lighthouse-beacon --skill git-agentic-branching-strategy
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-agentic-branching-strategy
Source: https://github.com/onshoreoutsourcing/lighthouse-beacon/tree/main/.claude/skills/git-agentic-branching-strategy
Command: npx skills add https://github.com/onshoreoutsourcing/lighthouse-beacon --skill git-agentic-branching-strategy

SYSTEM DOCUMENTATION & REQUIREMENTS

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

Frequently Asked Questions about git-agentic-branching-strategy

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
What is the best Git branching strategy for managing multi-feature epics?

A Git feature branch should be created from an epic branch when working within a larger multi-feature initiative, or directly from development for standalone features, ensuring waves are committed directly to the feature branch.

How do I structure Git commits for development waves within a feature?

You should create standalone wave branches directly from the development branch, commit changes using standardized commit message conventions, and then merge the wave branch back into development upon completion.

Can I use this branching workflow for standalone waves outside of an epic?

Yes, you can use this branching workflow for standalone waves outside of an epic by creating the wave branch directly from development and merging it back into development after the wave is complete.

When should I merge an epic branch back into the development branch?

You should merge an epic branch back into the development branch only after all associated feature branches have been fully completed and merged into the epic branch.

Does this Git workflow enforce standardized commit message conventions?

Yes, this Git workflow enforces standardized commit message conventions for development waves, ensuring consistent project history across epic, feature, and standalone wave branches within Lighthouse LM projects.