~ / leaderboard / skill / merge-conflict-resolution
Skill · #3542
merge-conflict-resolution
Use when an in-progress merge, rebase, cherry-pick, or revert has conflicted hunks that require intent reconstruction, resolution, proof, and continuation.
5rigs use it
0%of all rigs
6.1kavg rig context tax
Get it
$ npx degit Dankosik/go-service-template-rest/.agents/skills/merge-conflict-resolution .claude/skills/merge-conflict-resolution From the most-starred rig that ships it: Dankosik/go-service-template-rest. Same-named skills in different rigs may differ — review before use.
Often used together with
thermo-nuclear-code-quality-review · 3grilling · 2idea-refine · 2planning-and-task-breakdown · 2orchestrator · 2code-review · 1handoff · 1receiving-code-review · 1glossary · 1lessons · 1
Rigs using merge-conflict-resolution (5)
Dankosik/go-service-template-rest
Go REST API template and Golang microservice boilerplate, AI-native for coding agents, with OpenAPI, PostgreSQL, sqlc, observability, and CI.
Orchestrator 4.4k tok · · Q18
synaptiai/synapti-marketplace
The Synapti Marketplace is a curated collection of Claude Code plugins designed for AI-augmented development + advanced analytical and research tasks. Each plugin provides specialized agents, skills, and commands that extend Claude Code's c
Skill Collector 8.3k tok · · Q20
Dankosik/rust-service-template-rest
Rust REST API template and microservice boilerplate on Tokio and axum, AI-native for coding agents, with OpenAPI, PostgreSQL, observability, and CI.
Skill Collector 5.1k tok · · Q0
hermes-jarvis-bot/hermes-agent-config-kit
Adapter kit for porting claude-code-config patterns into Hermes Agent skills, templates, and reviewed plugin candidates
Skill Collector 10.4k tok · · Q10
siddharth17196/dotfiles
system config files
Skill Collector 2.2k tok · · Q0