From git
Resolves Git merge conflicts from rebasing, merging, or cherry-picking. Shows status, context, upstream changes, three-way file access via staging slots, and checks conflict markers before continuing.
npx claudepluginhub bendrucker/claude --plugin gitThis skill is limited to using the following tools:
!`bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/status.ts`
Creates isolated Git worktrees for feature branches with prioritized directory selection, gitignore safety checks, auto project setup for Node/Python/Rust/Go, and baseline verification.
Executes implementation plans in current session by dispatching fresh subagents per independent task, with two-stage reviews: spec compliance then code quality.
Dispatches parallel agents to independently tackle 2+ tasks like separate test failures or subsystems without shared state or dependencies.
!bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/status.ts
!bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/context.ts
!bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/upstream.ts
Git stores three versions in staging slots during conflicts:
| Slot | Version | Command |
|---|---|---|
:1:path | Base (common ancestor) | git show :1:path |
:2:path | Ours (HEAD) | git show :2:path |
:3:path | Theirs (incoming) | git show :3:path |