~ / leaderboard / skill / resolve-merge-conflicts
Skill · #2866
resolve-merge-conflicts
Merge a base ref and safely regenerate compiled workflow lock-file conflicts.
6rigs use it
0%of all rigs
15.4kavg rig context tax
Get it
$ npx degit github/gh-aw/.github/skills/resolve-merge-conflicts .claude/skills/resolve-merge-conflicts From the most-starred rig that ships it: github/gh-aw. Same-named skills in different rigs may differ — review before use.
Often used together with
documentation · 3prototype · 2tdd · 2implement · 2Serena · 2find-skills · 1skill-creator · 1show-me · 1grill-me · 1domain-modeling · 1
Rigs using resolve-merge-conflicts (6)
github/gh-aw
GitHub Agentic Workflows
Skill Collector 15.7k tok · · Q5
OutlineDriven/odin-claude-plugin
Outline-Driven Development for Claude Code - 46 agents, 25+ skills, diagram-first methodology, AST-based editing, atomic commits.
Skill Collector 18.1k tok · · Q3
zeero/dotfiles
my confiuration files
Fort Knox 20.2k tok · · Q30
mastro993/fstack
🥞 A short stack of agent skills for everyday software engineering work.
Pragmatist 532 tok · · Q0
optiquity/optiquity-ai-agent-config-pack
Versioned AI agent team managed project orchestration system for Claude Code, Codex, and Gemini. Focused on software development projects with extensive support for Apple platforms, Python, and others, the system can be extended to support
Fort Knox 36.0k tok · · Q50
thinceller/claude-plugins
A collection of Claude Code marketplace plugins.
Skill Collector 1.6k tok · · Q18