conflict-resolver
gitใณใณใใชใฏใใ่งฃๆถใใSkill๏ผrebase/merge/stash/cherry-pick็ญใซๅฏพๅฟ๏ผ
gitใณใณใใชใฏใใ่งฃๆถใใSkill๏ผrebase/merge/stash/cherry-pick็ญใซๅฏพๅฟ๏ผ
Blocks destructive git and filesystem commands before execution. Prevents accidental loss of uncommitted work from git checkout --, git reset --hard, rm -rf, and similar destructive operations. Works as a Claude Code PreToolUse hook with fail-open semantics.
git add, commit, pushใฎๅฎๅๆไฝใๅฎ่กใใฌใใฅใผๅฏพๅฟใ่ปฝๅพฎใชไฟฎๆญฃๅพใฎใณใใใใปใใใทใฅใซไฝฟ็จใใกใคใณใจใผใธใงใณใใฎใณใณใใญในใ็ฏ็ดใฎใใใๅฎๅ็ใชgitๆไฝใใใฎSkillใซๅง่ญฒใใใ
GitHub issue lifecycle management with worktree isolation
Create or update root and nested AGENTS.md files that document scoped conventions, monorepo module maps, cross-domain workflows, and (optionally) per-module feature maps (feature -> paths, entrypoints, tests, docs). Use when the user asks for AGENTS.md, nested agent instructions, or a module/feature map.
Use when receiving code review feedback (especially if unclear or technically questionable), when completing tasks or major features requiring review before proceeding, or before making any completion/success claims. Covers three practices - receiving feedback with technical rigor over performative agreement, requesting reviews via code-reviewer subagent, and verification gates requiring evidence before any status claims. Essential for subagent-driven development, pull requests, and preventing false completion claims.
Use when contributing skills back to the community. Follow git workflow: sync upstream โ create branch โ develop skill โ test with writing-skills โ commit โ push โ PR. One skill per PR.
Use when starting feature work that needs isolation from current workspace or before executing implementation plans - creates isolated git worktrees with smart directory selection and safety verification
Use when the repo contains .agentscfg and the user asks to add/update agent configuration, skills, MCP, or tool settings. Enforce the agentscfg workspace layout and avoid creating separate/legacy agent config locations.
Pull Requestไฝๆในใญใซใ.github/PULL_REQUEST_TEMPLATE.mdใซๆบๆ ใใ้ซๅ่ณชใชPRใไฝๆใUse when: PRไฝๆใPull Requestไฝๆใๅคๆดๅ ๅฎนใฎPRๅใไพ้ ผใใใๆใ
Use when starting a session (resume previous work) or ending a session (create handover for next). Automatically detects mode based on conversation state. Handles dependency chains, key file overlap detection, self-healing via Repair mode, and auto-commits on completion.
Pull Requestไฝๆในใญใซใ.github/PULL_REQUEST_TEMPLATE.mdใซๆบๆ ใใ้ซๅ่ณชใชPRใไฝๆใUse when: PRไฝๆใPull Requestไฝๆใๅคๆดๅ ๅฎนใฎPRๅใไพ้ ผใใใๆใ
Use when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for merge, PR, or cleanup
Run repo startup: prompt load, checklist sync, optional PR triage, worktree hygiene, and CI pull. Best-effort with structured status.
ใใซใชใฏใจในใใฎใฌใใฅใผใณใกใณใใซไฝ็ณป็ใซๅฏพๅฟใใในใญใซใๆช่งฃๆฑบใณใกใณใใๅๅพใใๅ้กใๅๆใใไฟฎๆญฃๆกใๆๆกใใใณใกใณใๅไฝใงใณใใใใไฝๆใใๆๅใงใฎ่ฟไฟกใจresolveใใฌใคใใใพใใGitHubใฎPRใฌใใฅใผใซๆง้ ๅใใใๆด็ใใใๅฏพๅฟใๅฟ ่ฆใชๅ ดๅใซไฝฟ็จใใฆใใ ใใใ
์ ํด์ง ํ์์ ๋ฐ๋ผ ๊ตฌ์กฐํ๋ ํ๊ธ ์ปค๋ฐ ๋ฉ์์ง๋ฅผ ์์ฑํฉ๋๋ค. ์ปค๋ฐ ์์ฑ ์ ํ๋ก์ ํธ์ ์ปค๋ฐ ์ปจ๋ฒค์ ์ ์๋์ผ๋ก ์ ์ฉํ์ฌ ์ผ๊ด์ฑ ์๋ ์ปค๋ฐ ํ์คํ ๋ฆฌ๋ฅผ ์ ์งํฉ๋๋ค.
Verify developers are working in the right repository type (brain vs code)