Local git operations for syncing, branching, merging, and conflict resolution
Local git operations for syncing, branching, merging, and conflict resolution
npx skills add https://github.com/dtsong/claude-code-windows-setup --skill git-workflows이 명령을 Claude Code에 복사하여 붙여넣어 스킬을 설치하세요
Use when working with dbt (data build tool) - creating models, writing tests, CI/CD pipelines, materializations, sources, staging/intermediate/marts layers, Snowflake/BigQuery warehouse configuration, incremental strategies, Jinja macros, data quality, semantic layer, or making analytics engineering decisions
GitHub interactions for issues, PRs, releases, and repository management
Test-driven development reference for writing good tests, designing testable interfaces, mocking at system boundaries, and refactoring after green. Use when writing tests, reviewing test quality, or applying red-green-refactor workflow. Not for running test suites or CI configuration — use language-conventions or cicd-generation for those.
Use when working with Terraform or OpenTofu - creating modules, writing tests (native test framework, Terratest), setting up CI/CD pipelines, reviewing configurations, choosing between testing approaches, debugging state issues, implementing security scanning (trivy, checkov), or making infrastructure-as-code architecture decisions
Security audit checklist for web applications. Use when reviewing, auditing, or hardening a web app's security posture. Covers rate limiting, auth headers, IP blocking, CORS, security middleware, input validation, file upload limits, ORM usage, and password hashing. Triggers on requests like "review security", "harden this app", "security audit", "check for vulnerabilities", or when building/reviewing API endpoints.
Use this skill when performing hardware security analysis for System-on-Chip components — threat modeling, verification scaffolding, compliance mapping, executive briefing, microarchitectural attack analysis, physical side-channel assessment, kernel security analysis, emerging hardware security, or TLA+ formal specification. Routes to the appropriate specialist. Trigger phrases include "threat model my SoC", "run STRIDE analysis", "generate SVA assertions", "compliance check against FIPS", "executive summary of findings", "Spectre analysis for cache", "DPA attack assessment", "kernel hardening review", "PQC hardware review", "TLA+ spec for access control". Do NOT use for software-only security, network security, or web application security.
| 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