~ / leaderboard / skill / resolving-merge-conflicts
Skill · #106 
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
40rigs use it
1%of all rigs
7.1kavg rig context tax
Get it
$ npx degit stevesolun/ctx/.agents/skills/resolving-merge-conflicts .claude/skills/resolving-merge-conflicts From the most-starred rig that ships it: stevesolun/ctx. Same-named skills in different rigs may differ — review before use.
Often used together with
diagnosing-bugs · 34grilling · 34codebase-design · 33domain-modeling · 33research · 31grill-me · 29handoff · 29implement · 28tdd · 28grill-with-docs · 28
Rigs using resolving-merge-conflicts (40)
stevesolun/ctx
CTX Fit finds the cheapest AI coding setup that reliably works on your repository, then applies the winner as a reviewable change.
Skill Collector 3.4k tok ·
Asymmetric-al/core
A high-performance, enterprise-grade Next.js 16 application for mission-focused non-profit organizations. Built for high impact teams.
Skill Collector 19.6k tok ·
michaelmjhhhh/pi-atelier
An elegant, information-rich status, menu, and side bar for Pi Agent.
Skill Collector 1.6k tok ·
romiluz13/cc10x
The Loop Engine for Claude Code — engineer the loop, not the prompt. 1 router · 9 agents · 16 skills · 4 workflows. Fail-closed gates, test honesty, anti-anchored review.
Skill Collector 775 tok ·
gtapps/hermitd
Turn Claude Code into a 24/7 Agent
Skill Collector 9.2k tok ·
zenobi-us/dotfiles
my workstation setup for linux, windows and mac
Skill Collector 2.9k tok ·
ahonn/dotfiles
💎 My vim/neovim, claude code, nix, git, and tmux configuration files
YOLO Cowboy 3.3k tok ·
agross/dotfiles
My config files.
Orchestrator 2.8k tok ·
nmdra/Dotfiles
Linux Dotfiles (Manjaro + KDE Plasma 6)
Skill Collector 805 tok ·
crafts69guy/.dotfiles
This repo leverages GNU Stow to simplify symlink management, making it easy to install and update configurations across different machines.
Skill Collector 5.3k tok ·
AjayIrkal23/agentic-mercy-10x
My complete Claude Code agentic workspace - 200+ curated skills, 9-agent specialist mesh, 3-act /invoke orchestration, enforcement hooks. Clone + one command = full setup.
Orchestrator 8.6k tok ·
shekohex/dotai
My AI Agents Home
Skill Collector 14.8k tok ·
michielvandermeer/skills
—
Orchestrator 2.5k tok ·
pruett/dotfiles
🍒 ~ / . *
YOLO Cowboy 31.5k tok ·
feniix/dotfiles
State-tracked, reversible macOS developer environment for Apple Silicon.
Orchestrator 6.8k tok ·
zakuciael/nixos-dotfiles
A repository containing configuration files for my NixOS machine
Skill Collector 1.8k tok ·
ValorVie/custom-skills
Automated AI dev environment setup CLI with curated Skills collection for Claude Code and other AI coding assistants.
Orchestrator 6.2k tok ·
ForgeyClap/claude-forge
Zero-dependency multi-agent build, automation and review system for Claude Code. 18 agents, 23 skills, a live per-project dashboard, and a /setup-forge onboarding wizard. One command: /forge.
Orchestrator 8.9k tok ·
AlexisBalayre/claude-code-config
Opinionated Claude Code config: path-scoped rules, 34 skills, 12 subagents, deterministic hooks, and a multi-agent PR review. Stack-agnostic; run /adapt-to-project to fit any repo.
Fort Knox 6.4k tok ·
emanuelrechsteiner/claude-rcode
R.Code for Claude Code — Build smarter. Build better. Guardrails that hold, a team of specialist agents, a live Cockpit for your terminal, pseudonymized by design. MIT.
YOLO Cowboy 8.8k tok ·
marinvch/Cortex
A context manager for new and legacy codebases — indexes a repo, reports what is missing, and writes the context layer agents actually read. Installable as a Claude plugin.
Orchestrator 11.5k tok ·
AlphaSaleAidan/opus-5-5-x-gpt-skill-tree
Opus 5.5 x GPT New Models Skill Tree — 348 preloaded Claude Code + Codex agent skills with a multi-model router: Claude Opus 5.5 leads, Fable writes the markdown handoff, GPT-6 Astra, Sol and Luna build. By Aidan Pierce.
Skill Collector 11.7k tok ·
ultivis-iot/claude-code-setup
—
Orchestrator 1.5k tok ·
MortuisVMain/ai-agent-superpowers
🧠 132+ Engineering Superpowers & Cognitive Architecture for Autonomous AI Agents. Zero Slop, 100% Craft.
Skill Collector 3.7k tok ·
shahwan42/shdots
Shahwan's dotfiles managed by chezmoi (https://www.chezmoi.io/)
Skill Collector 3.8k tok ·
anasalqoyyum/ansible
Ansible playbook for system configuration.
YOLO Cowboy 3.7k tok ·
svyatov/supermatt
The best of Matt Pocock's Skills, Superpowers, and Compound Engineering. One complete, simple, supercharged SDLC system for your coding agent.
Skill Collector 3.0k tok ·
AlexisBalayre/agentspine
One shared agent setup for Claude Code, Codex, opencode, Mistral Vibe and Cursor: AGENTS.md, skills and blocking hooks stored once in .agents/ and wired into every tool.
Orchestrator 3.3k tok ·
gdm257/dotfiles
—
Skill Collector 5.2k tok ·
drlinggg/claude-dotfiles
—
Skill Collector 623 tok ·