git-conflicts

name	git:conflicts
description	Resolving git merge conflicts during rebase, merge, or cherry-pick. Use when conflicts arise. Can also drive the operation to completion and push when asked (e.g. "fix conflicts and push").
argument-hint	[--push]
allowed-tools	["Read","Edit","Grep","Glob","AskUserQuestion","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":"[Truncated]"}]}

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 a conflict: