Menu
Local git operations for syncing, branching, merging, and conflict resolution
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Use when designing component interaction specs with visual states, transitions, and accessibility requirements. Covers state matrices, responsive behavior, ARIA compliance, and content constraints. Do not use for multi-step user journey mapping (use journey-mapping).
Use when mapping complete user journeys through multi-step flows, onboarding sequences, or feature workflows. Covers entry points, happy paths, alternate paths, error states, friction analysis, and delight opportunities. Do not use for individual component interaction specs (use interaction-design).
Use when analyzing an existing codebase for architecture, tech stack, conventions, and infrastructure. Covers project structure mapping, data model discovery, integration point cataloging, and constraint identification. Do not use for schema changes (use schema-design) or API contract definition (use api-design).
Use when designing documentation architecture for a project or team. Covers audience mapping, Diataxis framework classification, onboarding path design, format and location decisions, documentation testing, and maintenance scheduling. Do not use for recording individual architecture decisions (use adr-template) or creating versioned changelogs (use changelog-design).
Use when auditing codebase patterns or evaluating proposed changes for convention consistency. Covers file naming, component patterns, data fetching, state management, and type conventions. Do not use for test plan design or coverage targets (use testing-strategy).
Use when classifying data elements by sensitivity tier and defining per-tier handling requirements. Covers data inventory, sensitivity classification, PII flow mapping, encryption and masking specifications, and cross-boundary transfer documentation. Do not use for regulatory gap analysis (use compliance-review) or audit logging design (use audit-trail-design).
| name | git-workflows |
| description | Local git operations for syncing, branching, merging, and conflict resolution |
| triggers | ["git workflow","git help","git operations"] |
| user_invocable | true |
A comprehensive suite of git workflow skills for local repository operations.
.., shell metacharacters, or null bytes.. traversal, null bytes, and shell metacharacters| Skill | Purpose | Invoke |
|---|---|---|
/git-sync | Fetch and show remote changes | git sync, what's new upstream |
/git-pull | Pull with merge/rebase strategy | git pull, get latest |
/git-push | Push with upstream handling | git push, push changes |
| Skill | Purpose | Invoke |
|---|---|---|
/git-stash | Save/pop/list stashed changes | git stash, save my work |
| Skill | Purpose | Invoke |
|---|---|---|
/git-branch | Create branches with naming conventions | git branch, new branch |
/git-switch | Switch branches safely | git switch, checkout branch |
/git-branches | List and visualize branch status | git branches, list branches |
/git-delete-branch | Delete local/remote with safety | delete branch, cleanup branch |
| Skill | Purpose | Invoke |
|---|---|---|
/git-merge-main | Merge main into feature branch | merge main, update from main |
/git-rebase | Rebase onto main with guidance | git rebase, rebase onto main |
/git-squash | Squash commits non-interactively | git squash, clean up commits |
| Skill | Purpose | Invoke |
|---|---|---|
/git-abort | Abort failed merge/rebase/cherry-pick | git abort, cancel merge |
/git-conflicts | Guided conflict resolution | git conflicts, fix conflicts |
# Sync workflow
/git-sync # See what's new
/git-pull # Get changes
/git-push # Push changes
# Branch workflow
/git-branch feat/xyz # Create branch
/git-switch main # Switch branch
/git-branches # See all branches
# Integration
/git-merge-main # Update from main
/git-rebase # Rebase on main
/git-squash # Clean up history
git rebase -i) requires a TTY and fails in Claude Code — use git rebase (non-interactive) or git rebase --ontogit checkout is ambiguous (branches vs files) — prefer git switch for branches, git restore for files--force) to protected branches is rejected by most remotes — use --force-with-lease which fails if remote has new commitsgit stash doesn't stash untracked files — use git stash -u to include untrackedgit pull with diverged branches creates merge commits — use git pull --rebase or git pull --ff-only to avoid surprise mergesgit add . stages everything including .env files and secrets — always use git add <specific-files> or check git status first/commit - Create commits with conventional messages/commit-push-pr - Full commit, push, and PR workflow/gh-pr-* - GitHub PR operations