Reference Files

• workflow-phases.md - Step-by-step phase instructions
• commit-format.md - Commit message formatting rules
• branch-protection.md - Protected branch detection (Phase 0 + Phase 6)
• phase-5-protocol.md - Pre-push quality review checklist
• rebase-guide.md - History cleanup with git reset --soft
• examples.md - Workflow examples (simple feature, bug fix, refactor, cleanup, PR)

Git Workflow Skill

Analyzes repository changes, organizes them into atomic commits with well-formatted messages, manages branches, cleans up commit history, and helps create pull requests.

Workflow Overview

Key rules:

• Never use git rebase -i (requires interactive input) — use git reset --soft instead
• Always block pushes to protected branches (main/master/develop/production/staging)
• Commit messages: imperative mood, ≤72 chars, explain WHY not WHAT

Edge Case Quick Reference

User Interaction Patterns

Use AskUserQuestion for: branch creation, commit plan approval, push confirmation, PR creation, force push warnings, protected branch warnings.

Use TaskCreate for: tracking multiple commits (3+), long workflows.

Use Bash for: all git and gh commands.

Key Workflow Patterns

• One logical change = one commit; don't mix unrelated changes
• Commits should build on each other (add new, migrate, remove old)
• Clean up messy history before pushing
• Include tests with the code they test
• Keep config changes separate unless tightly coupled
• Always branch per feature; never commit directly to main

When NOT to Use

• Simple single-file commits — direct git add && git commit is faster
• Amending the last commit — use git commit --amend directly
• Cherry-picking or reverting — use standard git workflows
• Resolving merge conflicts — user must resolve manually first
• Submodule operations — needs manual handling

For syncing your local repo, use vc-sync instead.