Skill
agent-comms
SendMessage recipient validation and worktreePath safety (CWE-59). TRIGGER when: validating a SendMessage `to:` recipient against the agent whitelist, or a…
@komlukView SkillDevelopment
Skill
/git-operations
Git command patterns, branching strategy, and safety protocols. TRIGGER when: managing branches, resolving merge conflicts, or running commit/merge/push operations. SKIP: worktree lifecycle and isolation recovery (use worktree-management); CI automation (use
Install
$ npx -y skills add komluk/scaffolding --skill git-operations --agent claude-codeHow it fires
How this skill gets triggered: by you, by Claude, or both.
- Fires itselfAuto-invocation. Claude auto-loads it when your prompt matches the work.Auto-invocation is when the right skill fires by itself at the right moment, driven by a FLOW.md router and a hook, instead of you invoking it by name. It is the difference between a skill being installed and a skill actually getting used.Read the full definition →
- You can call itInvoke it directly when you want it.
- Slash command
/git-operations
Context preview
The summary Claude sees to decide when to auto-load this skill.
Git command patterns, branching strategy, and safety protocols. TRIGGER when: managing branches, resolving merge conflicts, or running commit/merge/push operations. SKIP: worktree lifecycle and isolation recovery (use worktree-management); CI automation (use
SKILL.md
git-operations.SKILL.mdname: git-operations
description: "Git command patterns, branching strategy, and safety protocols. TRIGGER when: managing branches, resolving merge conflicts, or running commit/merge/push operations. SKIP: worktree lifecycle and isolation recovery (use worktree-management); CI automation (use github-actions-template)."
Git Operations Skill
Purpose
Core git command patterns, branching strategies, and safety protocols for a project.
Current branch: !`git branch --show-current 2>/dev/null || true`
Branching Convention
| Branch Pattern | Purpose | |----------------|---------| | `main` | Production branch, always stable | | `scaffolding/{task_id[:12]}` | Worktree task branches (auto-created) | | `backup/{task_id[:12]}` | Safety backup before destructive ops |
Safe Operation Patterns
Before Any Destructive Operation
git status
git stash list
git log --oneline -5
git branch backup/$(date +%s) HEAD
Merge Strategy
git merge --no-commit --no-ff branch_name
git diff --cached --stat
git merge --continue # or --abort
Conflict Resolution
git diff --name-only --diff-filter=U
git checkout --ours path/to/file # keep ours
git checkout --theirs path/to/file # keep theirs
Cherry-Pick
git cherry-pick --no-commit <commit>
git diff --cached --stat
git cherry-pick --continue
Common Error Patterns
| Error | Fix | |-------|-----| | `fatal: not a git repository` | Verify path, check .git exists | | `CONFLICT (content)` | Use conflict resolution protocol | | `cannot lock ref` | Wait and retry, check stale locks | | `worktree is not clean` | Stage+commit or stash |
Push Operations
Standard Push (after workflow)
# 1. Verify unpushed commits exist
git log --oneline origin/main..HEAD
# 2. Push to remote
git push origin main
# 3. Verify push succeeded
git log --oneline origin/main..HEAD # should be empty
Push Safety Rules
- NEVER use `--force` or `--force-with-lease` without explicit user confirmation
- Always verify unpushed commits BEFORE push
- Always verify push success AFTER push
- If push fails due to divergence, report to user -- do NOT auto-rebase
Finishing Flow
After work is complete on a branch, execute one of these four actions based on context.
Merge to Main
git checkout main
git merge --ff-only <branch> # try fast-forward first
# if ff fails: git merge --no-ff <branch>
git branch -d <branch>
git worktree remove .scaffolding/worktrees/<task_id> 2>/dev/null
git worktree prune
Create PR
git push -u origin <branch>
gh pr create --title "<title>" --body "<body>"
# keep branch and worktree
Keep Branch
# no action needed -- branch stays as-is
git push -u origin <branch> # optional: push to remote for safety
Discard Branch
git checkout main
git worktree remove .scaffolding/worktrees/<task_id> 2>/dev/null
git branch -D <branch>
git worktree prune
Read more
name: git-operations description: "Git command patterns, branching strategy, and safety protocols. TRIGGER when: managing branches, resolving merge conflicts, or running commit/merge/push operations. SKIP: worktree lifecycle and isolation recovery (use worktree-management); CI automation (use github-actions-template)."
Git Operations Skill
Purpose
Core git command patterns, branching strategies, and safety protocols for a project.
Current branch: !`git branch --show-current 2>/dev/null || true`
Branching Convention
| Branch Pattern | Purpose | |----------------|---------| | `main` | Production branch, always stable | | `scaffolding/{task_id[:12]}` | Worktree task branches (auto-created) | | `backup/{task_id[:12]}` | Safety backup before destructive ops |
Safe Operation Patterns
Before Any Destructive Operation
git status git stash list git log --oneline -5 git branch backup/$(date +%s) HEAD
Merge Strategy
git merge --no-commit --no-ff branch_name git diff --cached --stat git merge --continue # or --abort
Conflict Resolution
git diff --name-only --diff-filter=U git checkout --ours path/to/file # keep ours git checkout --theirs path/to/file # keep theirs
Cherry-Pick
git cherry-pick --no-commit <commit> git diff --cached --stat git cherry-pick --continue
Common Error Patterns
| Error | Fix | |-------|-----| | `fatal: not a git repository` | Verify path, check .git exists | | `CONFLICT (content)` | Use conflict resolution protocol | | `cannot lock ref` | Wait and retry, check stale locks | | `worktree is not clean` | Stage+commit or stash |
Push Operations
Standard Push (after workflow)
# 1. Verify unpushed commits exist git log --oneline origin/main..HEAD # 2. Push to remote git push origin main # 3. Verify push succeeded git log --oneline origin/main..HEAD # should be empty
Push Safety Rules
- NEVER use `--force` or `--force-with-lease` without explicit user confirmation
- Always verify unpushed commits BEFORE push
- Always verify push success AFTER push
- If push fails due to divergence, report to user -- do NOT auto-rebase
Finishing Flow
After work is complete on a branch, execute one of these four actions based on context.
Merge to Main
git checkout main git merge --ff-only <branch> # try fast-forward first # if ff fails: git merge --no-ff <branch> git branch -d <branch> git worktree remove .scaffolding/worktrees/<task_id> 2>/dev/null git worktree prune
Create PR
git push -u origin <branch> gh pr create --title "<title>" --body "<body>" # keep branch and worktree
Keep Branch
# no action needed -- branch stays as-is git push -u origin <branch> # optional: push to remote for safety
Discard Branch
git checkout main git worktree remove .scaffolding/worktrees/<task_id> 2>/dev/null git branch -D <branch> git worktree prune
Ships withscaffolding
Spec-driven multi-agent orchestration for Claude Code — pure markdown, zero backend, runs on the stock runtime. 13 agents, 36 skills, 19 commands, 15 hooks, per-phase model tiers, opt-in lifecycle hooks, optional cross-device semantic memory.
Get the whole plugin
Stats
15
Stars
0
Forks
Maintained
Maintenance
Shell
Language
MIT
License
1mo ago
Last commit
5mo ago
Created
Repo: komluk/scaffolding
Other skills on scaffolding.
@komlukView SkillSkill
agent-memory
3-tier markdown memory protocol (shared/agent/conversation) for cross-session knowledge. TRIGGER when: reading or writing agent memory files, choosing which…
@komlukView SkillSkill
api-design
RESTful API design standards: resource naming, HTTP methods, status codes, pagination, versioning. TRIGGER when: designing new API endpoints, defining error…
@komlukView SkillSkill
context-engineering
Optimize Claude Code context-window usage for accuracy and cost. TRIGGER when: hitting context limits, structuring prompts for an agent, or trimming what gets…
@komlukView SkillSkill
database-optimization
Schema design, index strategy, migration safety, and query analysis. TRIGGER when: designing tables or indexes, writing a migration, or diagnosing a slow…
@komlukView Skill