git-workflow

Automate a three-branch Git workflow with issue-based squad branches and PR-driven releases.

Updated Nov 27, 2024
One-click install
npx skills add https://github.com/Izak90/Izak90.github.io --skill git-workflow-izak90
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/Izak90/Izak90.github.io/tree/main/isaac_treinos_ar_livre/.copilot/skills/git-workflow
Command: npx skills add https://github.com/Izak90/Izak90.github.io --skill git-workflow-izak90

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Squad-wide Git workflows can be inconsistent and error-prone when branching and releasing across main, dev, and insiders. This Skill standardizes the three-branch model and squad-based branch naming to reduce misalignment and merge conflicts.

Core Features & Use Cases

  • Three-branch model: main, dev, insiders with a clear release and publish path.
  • Issue-based squads: branches named squad/{issue-number}-{slug} to align work items with code.
  • PR-driven releases: collaboration via pull requests to merge changes from feature work into dev before promotion.

Quick Start

Adopt the squad dev-first workflow by starting from dev, creating squad/{issue-number}-{slug} branches, and using pull requests to merge back into dev.

Frequently Asked Questions about git-workflow

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

FAQPage Schema
How do I standardize a multi-branch Git workflow to reduce merge conflicts?

Standardize a multi-branch Git workflow by adopting a three-branch model with main, dev, and insiders branches. This structure enforces a clear release path and aligns team development to reduce branching mistakes and merge conflicts.

What is the branch naming convention for issue-based squad branches?

Issue-based squad branches use the naming convention squad/{issue-number}-{slug}. This aligns work items directly with code changes, ensuring traceability and organization across single or multi-repo contexts.

How do pull requests work in a three-branch Git model?

In a three-branch Git model, pull requests drive releases by merging changes from squad branches into dev. Work starts from dev, and PRs are used to collaborate and merge feature work before promotion.

Can I use this Git workflow across multiple repositories?

Yes, this Git workflow applies to both single and multi-repo contexts. It specifies branch naming conventions, PR processes, and worktree usage guidelines to maintain consistency across all repositories.

What is the release path from dev to main in a squad-based workflow?

The release path follows a dev-first approach where changes merge into dev via pull requests. Dev serves as the integration branch before promotion to main and insiders, codifying commands and steps as specified in the SKILL.md.