git-workflows

What it does and when to use it

Git workflows: trunk-based development vs GitFlow, Conventional Commits specification, PR templates, branch protection rules, merge strategies (squash vs merge vs rebase), interactive rebase for clean history, git bisect for debugging, monorepo patterns. Use when setting up team git workflow, writing commit messages, reviewing PR process.

How it works

1. When to Use This Skill
2. Core Principles
3. References available

---
name: git-workflows
description: |
  Git workflows: trunk-based development vs GitFlow, Conventional Commits specification,
  PR templates, branch protection rules, merge strategies (squash vs merge vs rebase),
  interactive rebase for clean history, git bisect for debugging, monorepo patterns.
  Use when setting up team git workflow, writing commit messages, reviewing PR process.
allowed-tools: Read, Grep, Glob
---

# Git Workflows

## When to Use This Skill
- Choosing between trunk-based development and GitFlow
- Writing Conventional Commits for automatic changelogs
- Setting up branch protection and PR review requirements
- Cleaning up commit history before merging
- Debugging regressions with git bisect

## Core Principles

1. **Trunk-based development for speed** — long-lived branches cause merge hell; merge to main daily
2. **Conventional Commits enable automation** — `feat:`, `fix:`, `chore:` → automatic semantic versioning and changelogs
3. **Squash merge for feature branches** — one commit per feature on main = clean, bisectable history
4. **Feature flags over long branches** — merge incomplete code behind a flag; avoid 3-week branches
5. **Branch protection is non-negotiable** — no direct push to main; required reviews and CI passing

## References available
- `references/branching-strategies.md` — trunk-based workflow, branch naming conventions, PR template, branch protection rules, git bisect, interactive rebase
- `references/conventional-commits.md` — full type reference, breaking changes, examples, semantic versioning trigger rules
- `references/monorepo-strategies.md` — Turborepo, Nx, affected package detection, shared commit scopes

Versions

Database snapshot: 13.11.2026 · package version 1a8570278654 (SHA-256 digest of the entire package)

Downloads in the last 30 days: 0 · ranking

Report a problem with this skill: harmful content, incorrect descriptions or an author’s removal request.

Similar skills

• 100advanced-workflows
  Use this skill when the user says 'branching strategy', 'trunk-based development', 'GitFlow', 'GitHub Flow', 'release branches', 'feature flags vs branches', 'squash vs rebase vs merge', 'conventional commits', 'semantic versioning', 'git worktree', 'monorepo git', 'stacked…
• 100github
  Covers GitHub repository management and Git workflow governance: branching strategies (trunk-based, GitHub Flow, GitFlow), pull request and code review process, branch protection rulesets, CODEOWNERS, merge strategies, semantic versioning, conventional commits, Git tags, and…
• 100git-workflow
  Automate the complete Git development workflow — create feature branches with conventional naming, atomic commits with conventional commit messages, interactive rebase, squash merges, PR body generation from commit history, branch cleanup, and git worktree patterns. Use when…
• 100git-branching-strategies-gitflow-trunk
  Use this skill when selecting and enforcing team Git branching workflows comparing Trunk-Based Development and Gitflow.
• 100git
  Advanced Git workflows skill. Branching models, merge vs rebase, interactive rebase, git bisect, cherry-pick, worktrees, commit conventions. Triggers on: /godmode:git, "branching strategy", "rebase vs merge", "git bisect", "cherry-pick".
• 100git-workflow
  Implement Git branching strategies, PR workflows, and release management patterns. Configure GitFlow, trunk-based development, or GitHub Flow for team collaboration. Use when establishing version control workflows or improving development team collaboration.