git:conflicts

Resolving git merge conflicts. Use when rebasing, merging, or cherry-picking results in conflicts.

Stars: 13
Source: bendrucker/claude
Updated: 2026-05-31
Slug: bendrucker--claude--conflicts

// install — copy + paste into any project

mkdir -p .claude/skills && curl -fsSL https://raw.githubusercontent.com/bendrucker/claude/HEAD/plugins/git/skills/conflicts/SKILL.md -o .claude/skills/conflicts.md

Drops the SKILL.md into .claude/skills/conflicts.md. Works with Claude Code, Cursor, and any agent that loads SKILL.md files from .claude/skills/.

Git Conflicts

Status

!bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/status.ts

Context

!bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/context.ts

Upstream

!bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/upstream.ts

Three-Way Access

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`

References

rerere.md — Automatic resolution reuse for repeated rebases