git:20260608.5b9071b to git:20260615.1ec44ee

---

name: git:conflicts

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

allowed-tools:

- Read

- Edit

- Grep

- Glob

- Bash(git status:*)

- Bash(git diff:*)

- Bash(git show :*:*)

- Bash(git add:*)

- Bash(git log:*)

- Bash(git rebase:*)

- Bash(git merge:*)

- Bash(git cherry-pick:*)

- Bash(git rerere:*)

- Bash(git stash:*)

- Bash(git update-index:*)

- Bash(git fetch:*)

- Bash(git push:*)

- Bash(bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/*)

hooks:

PreToolUse:

- matcher: "Bash(git commit:*)|Bash(git rebase --continue:*)|Bash(git merge --continue:*)|Bash(git cherry-pick --continue:*)"

hooks:

- type: command

command: "bun ${CLAUDE_PLUGIN_ROOT}/skills/conflicts/scripts/check-markers.ts"

---

# 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

| 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](references/rerere.md) — Automatic resolution reuse for repeated rebases