القائمة
Git recipes, worktree management, push sequences, branch verification, and conflict resolution patterns.
التثبيت باستخدام Codex أو Claude انسخ هذا Prompt والصقه في Codex أو Claude أو مساعد آخر ليراجع صفحة Skill ويثبّتها لك.
استنادا إلى تصنيف SOC المهني
Push accountability, CI monitoring after push, background agent CI verification, verification command sequencing.
Production deployment rules, rollback-first recovery, dependency batching, CI cost awareness, and framework upgrade verification.
Always use when user asks to create, generate, draw, or design a diagram, flowchart, architecture diagram, ER diagram, sequence diagram, class diagram, network diagram, mockup, wireframe, or UI sketch, or mentions draw.io, drawio, drawoi, .drawio files, or diagram export to PNG/SVG/PDF.
Known agent error patterns -- debugging reference for tool failures, git errors, CI issues, and common mistakes. Consult when encountering unexpected behavior, tool errors, or CI failures.
gh CLI patterns, JSON field discovery, PR check interpretation, label management, merge settings verification.
macOS-specific patterns: launchd agent configuration, brew vs pip, zsh regex quirks, file descriptor limits.
| name | Git Workflow |
| description | Git recipes, worktree management, push sequences, branch verification, and conflict resolution patterns. |
Wrong -- unstaged changes break the pull:
git pull --rebase && git push
Right -- commit before pulling (clean tree required):
git add <files> && git commit -m "msg" && git pull --rebase && git push
Wrong -- no upstream, push and gh pr create both fail:
git push && gh pr create --title "feat: thing"
Right -- set upstream on first push:
git push -u origin <branch> && gh pr create --title "feat: thing"
Wrong -- pushes ALL local tags, fails if any old tag exists on remote:
git push --tags
Right -- push specific tags by name or use --follow-tags:
git push origin main && git push origin v1.0.0
Wrong -- assume branch from conversation context:
git commit -m "feat: add feature"
Right -- verify branch before every commit:
git branch --show-current && git commit -m "feat: add feature"
Wrong -- relative paths and lowercase -d:
cd ../worktree && pnpm test # cwd resets between calls
git worktree remove <path> && git branch -d <branch> # -d fails
Right -- absolute paths, force remove, uppercase -D:
cd /absolute/path/to/worktree && pnpm test
git worktree remove --force <path>; git branch -D <branch>
Always remove worktrees BEFORE merging PRs with --delete-branch.
Wrong -- assume the merge cleaned up; leave stale local branches behind (a cleanup "done" that left two local branches needing a second pass):
gh pr merge --squash --delete-branch # deletes the REMOTE branch only
Right -- a complete cleanup covers worktrees, local branches, and prune, then verifies nothing is left dangling:
# 1. Remove worktrees FIRST (a branch checked out in a worktree won't delete)
git worktree remove --force /absolute/path/to/worktree
git worktree prune
# 2. Delete the local branch (remote went with --delete-branch at merge)
git branch -D <branch>
# 3. Drop stale remote-tracking refs for branches deleted on the remote
git fetch --prune
# 4. Verify -- these should list ONLY active work, nothing merged
git branch --merged # local branches already merged
git worktree list # lingering worktrees
Anything still listed in step 4 is the "second pass" -- finish it now, not later.
Wrong -- plain checkout fails on unmerged files:
git checkout -- conflicted-file.ts
Right -- pick a side, abort, or remove conflicting untracked files:
git checkout --ours file.ts # keep yours
git checkout --theirs file.ts # keep incoming
git rebase --abort # cancel entirely
rm untracked-file.ts && git merge feature # untracked collision