From scaffolding
Git command patterns, branching strategies, and safety protocols. Use for branch management, conflict resolution, or worktree operations.
npx claudepluginhub komluk/scaffolding --plugin scaffoldingThis skill uses the workspace's default tool permissions.
Core git command patterns, branching strategies, and safety protocols for a project.
Integrates Mem0 persistent memory for Claude Code tasks using MCP tools. Retrieves relevant memories on new tasks, stores learnings like decisions and strategies, captures session states.
Creates web-based slidedecks for developers using Slidev with Markdown, Vue components, code highlighting, animations, interactive demos, and presenter notes. Use for technical presentations, conference talks, code walkthroughs, and workshops.
Core git command patterns, branching strategies, and safety protocols for a project.
| 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 |
git status
git stash list
git log --oneline -5
git branch backup/$(date +%s) HEAD
git merge --no-commit --no-ff branch_name
git diff --cached --stat
git merge --continue # or --abort
git diff --name-only --diff-filter=U
git checkout --ours path/to/file # keep ours
git checkout --theirs path/to/file # keep theirs
git cherry-pick --no-commit <commit>
git diff --cached --stat
git cherry-pick --continue
| 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 |
# 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
--force or --force-with-lease without explicit user confirmationAfter work is complete on a branch, execute one of these four actions based on context.
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
git push -u origin <branch>
gh pr create --title "<title>" --body "<body>"
# keep branch and worktree
# no action needed -- branch stays as-is
git push -u origin <branch> # optional: push to remote for safety
git checkout main
git worktree remove .scaffolding/worktrees/<task_id> 2>/dev/null
git branch -D <branch>
git worktree prune