git-workflow

Enforce a three-branch Git workflow with naming conventions and worktrees.

413|64|Updated Feb 7, 2023

Search Tags:#git #workflow #worktrees #branching #issue-tracking #branch-naming #squad

Ready to run

npx skills add https://github.com/christianhelle/refitter --skill git-workflow-christianhelle

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/christianhelle/refitter/tree/main/.copilot/skills/git-workflow
Command: npx skills add https://github.com/christianhelle/refitter --skill git-workflow-christianhelle

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Squad teams struggle with inconsistent branching models and coordination across developers. This skill provides a standardized dev-first three-branch workflow (main, dev, insiders) with clear branch-naming conventions to ensure consistent collaboration and release readiness.

Core Features & Use Cases

Three-branch model: main for releases, dev for integration, insiders for early access
Branch naming conventions: squad/{issue-number}-{slug} for issue work
Workflow for issue work: from branch creation to PRs and promotion, including the use of worktrees for parallel work
Anti-patterns and promotion pipeline: avoid branching from main and ensure PR-driven merges across dev and main

Quick Start

Start from the dev branch, create squad/{issue-number}-{slug} branches for work, and use dedicated worktrees for parallel issues.

Frequently Asked Questions about git-workflow

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

FAQPage Schema

How do I enforce a consistent git workflow across multiple branches and developers?▼

A standardized dev-first git workflow uses a three-branch model—main for releases, dev for integration, and insiders for early access—paired with branch naming conventions to ensure consistent collaboration and release readiness.

What is the best way to manage parallel feature development using git worktrees?▼

Managing parallel feature development with git worktrees involves creating dedicated worktrees for each issue and using squad/{issue-number}-{slug} branch naming conventions to isolate work and enable parallel exploration across repositories.

How do I name branches for issue-driven development in a squad team?▼

Branch naming for issue-driven development follows the squad/{issue-number}-{slug} convention, ensuring traceability from branch creation through pull requests and promotion across dev and main.

What are common git branching anti-patterns when scaling squad development?▼

Common git branching anti-patterns include branching directly from main instead of dev and bypassing PR-driven merges across the dev and main branches, which disrupts integration and release readiness.

Can I use this three-branch git workflow for multi-repo development scenarios?▼

Yes, the dev-first three-branch git workflow applies to multi-branch development scenarios and issue-driven work across multiple repositories, using worktrees and promotion pipelines to coordinate parallel feature exploration at scale.