subagent-conflict-detection
SolidUse before dispatching a subagent with `isolation:"worktree"`, or while another subagent is in flight, to avoid three dispatch hazards — file-scope overlap with an in-flight subagent, a stale dispatch base, and collisions with another live agent/session editing the same checkout or git-submodule path. Invoke when about to call the Agent tool with `isolation:"worktree"`; when another subagent is running; right after a merge or branch switch; or when another Claude session is editing a shared repo/submodule path. Does NOT cover PR / merge mechanics (github-contribution-workflow) or post-commit diff sanity (pr-diff-verification).
Install
Quality Score: 81/100
Skill Content
Details
- Author
- wei18
- Repository
- wei18/apple-dev-skills
- Created
- 2 months ago
- Last Updated
- today
- Language
- Python
- License
- MIT
Similar Skills
Semantically similar based on skill content — not just same category
concurrent-subagents-share-one-checkout-and-contend-on-head
Two or more subagents dispatched at the same repository by absolute path run in ONE working directory and contend on HEAD, so one agent's commit lands on another's branch and a rebase retargets a branch its author does not own. Use when: (1) about to dispatch more than one agent that will run git in the same repo, whether or not their FILES overlap; (2) a pre-launch check concluded "no collision" on the basis of file-overlap or different-repos reasoning; (3) `git log` on your branch shows a commit you did not author, or `git status -sb` reports ahead/behind counts that make no sense for a branch you just pushed; (4) an agent reports it rebased or committed and the result appears on someone else's ref; (5) `git branch -a --contains <sha>` returns only a branch belonging to different work. File-overlap analysis cannot see this class: the contention is on HEAD and the index, not on paths. The fix is worktree isolation at dispatch, not coordination after the fact.
isolate-parallel-work
Use BEFORE dispatching work that touches files or requires exclusive access to a server/port. Triggered by the need to run multiple agents concurrently or to prevent clobbering. Do NOT use for verifying output, guarding runtime, or composing payloads.
isolated-worktree
Implement and review in a sibling git worktree created from the latest default branch. Use when launching subagents, implementing a feature, reviewing a PR, or before any repo edits so agents do not work on main/master or nest worktrees inside a checkout.