{"id":"1da9a35e-7c05-4330-87f9-d362ea491e0f","shortId":"2Hsut8","kind":"skill","title":"git-workflow","tagline":"Git best practices, branching strategies, commit conventions, and PR workflows. Use when reviewing git history, writing commits, setting up branching strategy, or improving git practices. Triggers on \"git best practices\", \"commit message\", \"branching strategy\", or \"PR workflow\".","description":"# Git Workflow\n\nGit best practices, commit conventions, branching strategies, and pull request workflows. Guidelines for maintaining a clean, useful git history.\n\n## When to Apply\n\nReference these guidelines when:\n- Writing commit messages\n- Creating branches\n- Setting up git workflows\n- Reviewing pull requests\n- Maintaining git history\n\n## Rule Categories by Priority\n\n| Priority | Category | Impact | Prefix |\n|----------|----------|--------|--------|\n| 1 | Commit Messages | CRITICAL | `commit-` |\n| 2 | Branching Strategy | HIGH | `branch-` |\n| 3 | Pull Requests | HIGH | `pr-` |\n| 4 | History Management | MEDIUM | `history-` |\n| 5 | Collaboration | MEDIUM | `collab-` |\n\n## Quick Reference\n\n### 1. Commit Messages (CRITICAL)\n\n- `commit-conventional` - Use conventional commits\n- `commit-atomic` - Atomic commits (one logical change)\n- `commit-present-tense` - Use imperative present tense\n- `commit-meaningful` - Descriptive, meaningful messages\n- `commit-body` - Add body for complex changes\n- `commit-references` - Reference issues/tickets\n- `commit-git-hooks` - Enforce standards with Husky + commitlint\n\n### 2. Branching Strategy (HIGH)\n\n- `branch-naming` - Consistent branch naming\n- `branch-feature` - Feature branch workflow\n- `branch-main-protected` - Protect main branch\n- `branch-short-lived` - Keep branches short-lived\n- `branch-delete-merged` - Delete merged branches\n- `branch-release` - Release branch strategy\n- `branch-workflow-strategies` - GitFlow vs GitHub Flow vs Trunk-Based\n- `branch-monorepo` - Monorepo git workflows\n\n### 3. Pull Requests (HIGH)\n\n- `pr-small` - Keep PRs small and focused\n- `pr-description` - Write clear descriptions\n- `pr-reviewers` - Request appropriate reviewers\n- `pr-ci-pass` - Ensure CI passes\n- `pr-squash` - Squash when appropriate\n- `pr-draft` - Use draft PRs for WIP and early feedback\n\n### 4. History Management (MEDIUM)\n\n- `history-rebase` - Rebase vs merge\n- `history-no-force-push` - Avoid force push to shared branches\n- `history-clean` - Keep history clean\n- `history-tags` - Use tags for releases\n- `history-worktree` - Work on multiple branches with git worktree\n\n### 5. Collaboration (MEDIUM)\n\n- `collab-code-review` - Effective code reviews\n- `collab-conflicts` - Handle merge conflicts\n- `collab-communication` - Communicate changes\n- `collab-gitignore` - .gitignore best practices\n\n## Essential Guidelines\n\n### Conventional Commits\n\n```\n# Format\n(): \n\n\n\n