git-workflow

Coordinate multi-repo development with a three-branch Git workflow.

49|6|Updated Aug 24, 2021
One-click install
npx skills add https://github.com/webmaxru/bpm-counter --skill git-workflow-webmaxru
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/webmaxru/bpm-counter/tree/main/.copilot/skills/git-workflow
Command: npx skills add https://github.com/webmaxru/bpm-counter --skill git-workflow-webmaxru

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Enables teams to structure and coordinate feature development and releases using a clear three-branch Git workflow (main, dev, insiders), reducing merge conflicts and drift between development and production.

Core Features & Use Cases

  • Three-branch model:
    • main: Released, tagged, and published; code only.
    • dev: Integration branch — features merged here before release; publishes with the preview tag.
    • insiders: Early-access channel — synced from dev.
  • Branch naming convention: squad/{issue-number}-{slug} for traceability.
  • Issue-focused workflow: Steps to branch, label, draft PRs, merge, and cleanup.
  • Worktrees and cross-repo scenarios: Isolated environments for parallel issues and coordinated multi-repo work.
  • Promotion and anti-pattern guidance: Safe release pipelines and avoidance of common mistakes.

Quick Start

Initialize the three-branch workflow in your repository and begin feature work from dev using squad/{issue-number}-{slug} branches, with optional 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 structure a Git workflow for multi-repo projects with continuous integration?

A structured Git workflow for multi-repo projects uses a three-branch model (main, dev, insiders) to coordinate integration and releases. This enforces branch naming conventions and a promotion pipeline, producing CI-ready releases while minimizing drift between development and production.

What is the best way to manage parallel feature branches across multiple repositories?

Managing parallel feature branches across multiple repositories is best handled using Git worktrees for isolated environments. Coordinated cross-repo scenarios rely on an issue-focused workflow, branching from dev with traceable names like squad/{issue-number}-{slug} to synchronize parallel development.

When do I need an insiders branch in my release pipeline?

You need an insiders branch in your release pipeline when providing an early-access channel synced from dev. It sits alongside main for tagged production releases and dev for feature integration, allowing teams to publish preview tags before promoting code to the final release.

How do I prevent merge conflicts when integrating multiple squad features into dev?

To prevent merge conflicts when integrating squad features into dev, apply a strict issue-focused workflow. Features branch from dev using standard naming conventions, draft PRs are reviewed, and merges follow a defined promotion pipeline with anti-pattern guidance to avoid conflicts and drift.

Does this Git branching model work for single-developer repositories?

This Git branching model targets squad-based teams handling multi-issue, multi-repo projects rather than single-developer repositories. Its dev-first release strategy, worktree coordination, and three-branch promotion pipeline are designed specifically to structure coordinated feature development and safe releases.

Why should I use a three-branch Git workflow instead of standard GitFlow?

A three-branch Git workflow distinguishes itself from standard GitFlow by enforcing a dev-first release approach with a dedicated insiders early-access channel. It reduces merge conflicts and drift by strictly separating tagged production code in main, integration in dev, and early previews in insiders.