git-workflow_skill

Overview

This skill automates a Git workflow that enforces Conventional Commits and streamlines staging, committing, PR creation, and merging. It provides ready-to-run shell patterns for standard commits, draft PR creation via GitHub CLI, and recommended merge strategies. The goal is consistent commit messages, predictable branch names, and safe merges across feature worktrees and main branches.

How this skill works

It inspects the current working tree, stages files, and constructs multi-line commit messages in Conventional Commits format using HEREDOCs. It can push branches, create draft PRs with a templated body using gh, and run configured merge commands (squash, merge, rebase) while optionally deleting the source branch. The skill also includes common error-handling steps for hooks, conflicts, wrong-branch commits, and secret removal.

When to use it

• When preparing a commit and you want a Conventional Commits-compliant message
• When opening a draft or final PR with a standardized title and body
• When merging a completed feature branch following project merge strategy
• When working in a git worktree and pushing/cleaning up feature branches
• When resolving pre-commit hook failures, merge conflicts, or accidental commits

Best practices

• Write commit messages with <type>(<scope>): <subject> and include body/footer using HEREDOC for multi-line content
• Follow branch naming: <type>/<issue-number>-<brief-description> (e.g., feature/270-codegen-agent)
• Prefer squash merges for most PRs to keep main history linear; use merge/rebase only when appropriate
• Run tests, linters, and formatters before committing (cargo test, cargo clippy, cargo fmt)
• Avoid committing secrets; if necessary, remove them from history and force-push with care
• Create PRs with a clear summary, test plan, related issues, and quality metrics in the body

Example use cases

• Stage changes and commit a new agent implementation with a Conventional Commits HEREDOC message
• Create a draft PR with a checklist, tests summary, and 'Closes #issue' using gh pr create
• Work in a git worktree for an issue, push the feature branch, and clean up after merge
• Recover from an accidental commit to the wrong branch using git reset --soft and reapply on the correct branch
• Handle a pre-commit hook change by amending the commit and force-pushing with lease