~ / leaderboard / skill / git-conflicts
Skill · #4526
git:conflicts
Guided conflict resolution for merge and rebase conflicts
4rigs use it
0%of all rigs
8.1kavg rig context tax
Get it
$ npx degit bendrucker/claude/plugins/git/skills/conflicts .claude/skills/git-conflicts From the most-starred rig that ships it: bendrucker/claude. Same-named skills in different rigs may differ — review before use.
Often used together with
tdd · 3github-triage · 3vercel-react-best-practices · 3git-rebase · 3web-design-guidelines · 3frontend-design@claude-plugins-official · 3architect · 3superpowers@claude-plugins-official · 3workflow · 3scout · 3
Rigs using git:conflicts (4)
bendrucker/claude
My personal plugin marketplace and settings for Claude Code
Skill Collector 10.3k tok · · Q18
dtsong/my-claude-setup
Portable Claude Code setup: skills, agents, commands, and a safe installer
YOLO Cowboy 7.7k tok · · Q19
dtsong/claude-code-windows-setup
Claude Code Setup for Windows — native PowerShell port with 38 agents, 100+ skills, 8 deliberation modes, and lifecycle hooks
Orchestrator 7.4k tok · · Q16
dtsong/claude-code-wsl-setup
Multi-agent Claude Code setup for Windows/WSL with smart notifications, auto-formatting, and parallel agentic development workflows. Based on Boris Cherney (Claude Code creator)'s workflow.
Orchestrator 7.0k tok · · Q16