skills.rest
camilooscargbaptista
camilooscargbaptistaCOMMUNITY
Explore all skills by this author →
WebsiteGitHub

git-flow

Define Git branching strategies and commit/release conventions for version control workflows.

7|Updated Mar 19, 2026
Search Tags:#git#branching#release-management#merge-conflicts#git-flow#conventional-commits#commit-messages
One-click install
npx skills add https://github.com/camilooscargbaptista/cto-toolkit --skill git-flow-camilooscargbaptista
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-flow
Source: https://github.com/camilooscargbaptista/cto-toolkit/tree/main/git-flow
Command: npx skills add https://github.com/camilooscargbaptista/cto-toolkit --skill git-flow-camilooscargbaptista

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Teams struggle with inconsistent branching, unclear commit conventions, chaotic release processes, and frequent merge conflicts that slow delivery and increase risk. This Skill helps define, document, and enforce a reproducible Git workflow so teams ship reliably and resolve conflicts with minimal disruption.

Core Features & Use Cases

  • Branching strategy guidance: Compare Git Flow, GitHub Flow, and Trunk-Based Development and recommend the best fit based on release cadence, team size, and CI maturity.
  • Commit and PR conventions: Provide Conventional Commits templates, PR title/description guidance, and recommended review gates to produce clean changelogs and reliable automated releases.
  • Release and hotfix processes: Offer release branch checklists, tagging/tag strategies, and hotfix workflows for emergency patches.
  • Conflict resolution & maintenance: Step-by-step guidance for merge conflict resolution, interactive rebase etiquette, cherry-picks for hotfixes, and when to prefer merge vs rebase.

Quick Start

Use the git-flow skill to recommend the best branching strategy for my medium-sized SaaS product and produce branch naming rules, commit message templates, and a release checklist.

Frequently Asked Questions about git-flow

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

FAQPage Schema
What's the best way to choose a Git branching strategy for my team?▼

Git Flow, GitHub Flow, and Trunk-Based Development differ by release cadence, team size, and CI maturity. Comparing these models yields a tailored branching strategy that aligns with your team's delivery velocity and pipeline automation.

How do I create Conventional Commits templates and PR conventions for automated releases?▼

Creating Conventional Commits templates and PR conventions involves defining structured commit message formats and PR review gates. This produces clean changelogs and enables reliable automated releases compatible with standard Git tooling.

How do I set up a Git release and hotfix workflow for emergency patches?▼

Setting up a Git release and hotfix workflow requires defining release branch checklists, tagging strategies, and hotfix processes. This generates step-by-step emergency patch workflows using cherry-picks to minimize production disruption.

How do I resolve Git merge conflicts using interactive rebase or cherry-picks?▼

Resolving Git merge conflicts uses step-by-step guidance for interactive rebase etiquette and cherry-picking hotfixes. This provides clear conflict-resolution instructions and defines when to prefer merging versus rebasing branches.

Does this Git workflow guidance work for medium-sized SaaS products with scheduled releases?▼

Git workflow guidance works for medium-sized SaaS products by evaluating scheduled release needs and CI maturity. It outputs branch naming rules, commit templates, and release checklists suited for continuous deployment environments.

Related Skills

Explore More Software Engineering Skills→
vasilyu1983vasilyu1983
73

git-workflow

Design Git branching strategies, PR workflows, and release automation.

Community
Advanced
whitebearditwhitebeardit
12

conventional-commits

Validate commit messages and PR titles against Conventional Commits rules.

Official
Intermediate
dsifrydsifry
7

pr-shepherd

Monitor GitHub pull requests and resolve CI failures until merge.

Community
Advanced
modu-aimodu-ai
4

moai-ref-git-workflow

Standardize Git workflows, branch strategies, and PR templates across projects.

Official
Advanced