git-workflow

Enforce a dev-first two-branch Git workflow with branch naming and PR rules.

Updated Mar 18, 2022
One-click install
npx skills add https://github.com/mpaulosky/dotfiles --skill git-workflow-mpaulosky
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/mpaulosky/dotfiles/tree/main/.copilot/skills/git-workflow
Command: npx skills add https://github.com/mpaulosky/dotfiles --skill git-workflow-mpaulosky

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Squad-based teams often struggle with coordination and inconsistent branching strategies, which leads to integration pain and release risk. This Skill defines a deterministic, squad-oriented Git workflow that uses a dev-first two-branch model to align development effort with stable delivery.

Core Features & Use Cases

  • Two-branch model: All feature work starts from the dev branch rather than main, enabling safer integration.
  • Branch naming conventions: Issue branches MUST follow squad/{issue-number}-{kebab-case-slug}.
  • PR and release flow: Clear guidance on drafting PRs, merging into dev, and promoting to main for releases.
  • Multi-issue coordination: Supports parallel work using per-issue branches and dedicated worktrees to avoid collisions.

Quick Start

Start from dev, create a new squad/{issue-number}-{slug} branch, implement changes, and open a draft PR targeting dev.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I manage git branch naming for squad-based feature development?

A dev-first two-branch git workflow routes all feature work through a dev branch before promoting to main, improving release stability. It establishes deterministic branching rules, PR workflows, and transition steps specifically for squad-based teams to avoid integration pain and uncoordinated releases.

How do I set up a pull request workflow that targets the dev branch first?

To set up a dev-first pull request workflow, create a squad/{issue-number}-{slug} branch from dev, implement changes, and open a draft PR targeting dev. After code review and merging into dev, the consolidated changes are later promoted to main for stable release deployment.

What is the best way to coordinate parallel feature branches across multiple issues?

Coordinating parallel feature work across multiple issues uses per-issue branches following the squad/{issue-number}-{slug} format combined with dedicated worktrees. This approach isolates development environments, prevents branch collisions, and enables multiple squad members to integrate features into dev independently.

When should my team use a two-branch model instead of a standard Git workflow?

Use a two-branch dev-first git workflow when squad-based teams face integration pain and release risk from inconsistent branching strategies. It is suited for multi-issue, multi-squad environments that need deterministic release planning and safer integration before promoting code to main.

Can I use draft PRs in a squad-oriented Git workflow?

Draft PRs are a core part of this squad-oriented git workflow and should be opened targeting the dev branch immediately after branch creation. They enable early code review feedback and signal work in progress before final integration into dev and subsequent release promotion to main.