Stats
Actions
Tags
Help us improve
Share bugs, ideas, or general feedback.
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 gitHow this skill is triggered — by the user, by Claude, or both
Slash command
/git:conflictsThis skill is limited to the following tools:
The summary Claude sees in its skill listing — used to decide when to auto-load this skill
!`bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/status.ts`
Resolves Git merge and rebase conflicts efficiently using bulk strategies like `git checkout --theirs/--ours` over manual conflict marker editing. Activates on merge/rebase conflicts.
Resolves Git merge and rebase conflicts file-by-file using modern tooling. Activates for conflicted merges, rebases, PRs unable to merge, or diverged branches. Supports --ours, --theirs, auto-push.
Resolves Git merge, rebase, cherry-pick, and stash pop conflicts by reading markers, choosing strategies, and safely continuing or aborting.
Share bugs, ideas, or general feedback.
!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 |