gitflow-expert

Provides read-only Git workflow guidance covering branching strategies, merge methods, and commit conventions.

Updated Jun 24, 2026
One-click install
npx skills add https://github.com/psmfd/pi-config --skill gitflow-expert-psmfd
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: gitflow-expert
Source: https://github.com/psmfd/pi-config/tree/main/agent/skills/gitflow-expert
Command: npx skills add https://github.com/psmfd/pi-config --skill gitflow-expert-psmfd

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Teams struggle to choose and consistently apply a Git branching model, merge strategy, and commit convention, leading to merge debt, broken releases, and divergent histories. This Skill gives an agent a read-only reference for making those decisions correctly. ## Core Features & Use Cases - Branching strategy selection: Compares GitFlow, GitHub Flow, trunk-based development, and release branching with decision tables covering team size, deployment model, and test maturity. - Merge and commit guidance: Explains merge commit vs squash vs rebase trade-offs, the golden rule of rebasing, Conventional Commits formatting, and SemVer alignment. - Repo-specific binding policy: Encodes pi_config's two-branch model (dev integration, main stable) including the bounded stable-hotfix carve-out, so advice about this repo follows its actual rules. - Use Case: A developer asks whether to rebase or merge a shared feature branch and how to structure a hotfix for production; the Skill returns the correct strategy plus the anti-patterns to avoid. ## Quick Start Ask the agent which branching strategy fits a 10-person SaaS team with continuous deployment and how to format the release commits.

Frequently Asked Questions about gitflow-expert

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

FAQPage Schema
How do I choose between GitFlow, GitHub Flow, and trunk-based development?▼

Choose based on deployment model, team size, and test maturity. GitFlow suits scheduled releases and multiple supported versions, GitHub Flow fits small SaaS teams with continuous deployment, and trunk-based development requires disciplined teams with feature flags and strong CI/CD.

When should I use squash merge vs merge commit vs rebase?▼

Use merge commits for auditable history and release-boundary PRs, squash merges for clean one-commit-per-feature topic branches, and rebase only on private branches for linear history. Never rebase branches others have pulled, since it rewrites shared SHAs.

How do Conventional Commits map to SemVer version bumps?▼

A fix commit triggers a PATCH bump, a feat commit triggers a MINOR bump, and a BREAKING CHANGE footer or exclamation-marked type triggers a MAJOR bump. Tools like semantic-release can automate this derivation from commit history.

Can this Skill create branches or merge pull requests for me?▼

No. It is a read-only reference with no mutation executor. It recommends actions, but the orchestrator or user must execute them, and GitHub CLI mechanics are routed to a separate gh-cli-expert agent.

What are the most damaging Git branching anti-patterns?▼

Long-lived feature branches are the most damaging because merge debt grows exponentially. Others include big bang merges, environment branches promoted via merge, rebasing shared branches, and applying GitFlow to continuously deployed web apps.