Resolving Merge Conflicts
Resolve an in-progress git merge or rebase conflict: read both intents from their primary sources, resolve every hunk, run the project checks, finish the merge. Use when a merge or rebase has stopped on conflicts.
Works with: Claude Code (native) · Cursor, Codex CLI (manual)
native: this artifact type is that client's own format
Category: Dev Tools & CI — see all ranked ›
Install (Claude Code):
cp -r resolving-merge-conflicts ~/.claude/skills/- tashan score: 47.0
- Adoption: 2 repos
- Upkeep: 82.0
- Freshness: 100.0
- Evidence coverage: 84% of the inputs this score can use — the rest are unknown, and the score is discounted for it
- Health: active
- Contributors: 2
- License: Apache-2.0
Security audit
Not scanned yet. We audit npm-published capabilities for known advisories, install-time scripts and permission surface; this one has no npm package we can resolve, or has not reached the queue.
source ↗ · skill:OutlineDriven/resolving-merge-conflicts
Already running this? npx tashan-cli doctor checks your whole config against the Index — how it works ›
Measured 2026-08-09 · scorer s5 · how · something wrong here?