git:conflicts

Description

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

AI Summary

Resolves git merge conflicts by analyzing differences and suggesting appropriate fixes during rebasing or merging operations.

Install

Run in your terminal

npx claudepluginhub bendrucker/claude

Tool Access

This skill is limited to using the following tools:

ReadEditGrepGlobBash(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/*:*)

Supporting Assets

View in Repository

references/rerere.md

scripts/check-markers.ts

scripts/context.ts

scripts/status.ts

scripts/upstream.ts

tests/fixtures/setup.ts

tests/scripts.test.ts

Skill Content

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

Links

GitHub Stats

1 forks

Updated 20 days ago

Actions

Similar Skills

brainstorming

You MUST use this before any creative work - creating features, building components, adding functionality, or modifying behavior. Explores user intent, requirements and design before implementation.

superpowers

68.7k

dispatching-parallel-agents

Use when facing 2+ independent tasks that can be worked on without shared state or sequential dependencies

superpowers

68.7k

executing-plans

Use when you have a written implementation plan to execute in a separate session with review checkpoints

superpowers

68.7k