# 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.

## Facts
- Page: https://tashan.sh/capability/skill-outlinedriven-resolving-merge-conflicts
- tashan id: skill:OutlineDriven/resolving-merge-conflicts
- Source: https://github.com/OutlineDriven/odin-claude-plugin
- Type: skill
- Category: devtools
- tashan score: 47.0 / 100
- Adoption: 14.0
- Upkeep: 82.0
- Freshness: 100.0
- Evidence coverage: 84% of the inputs this score can use
- Health: active
- Instruction depth: not yet graded
- License: Apache-2.0
- Official: no

## Install

```sh
cp -r resolving-merge-conflicts ~/.claude/skills/
```

## Security audit
Not scanned. We audit npm-published capabilities; this one has no npm package we can resolve, or has not reached the queue. This is not a clean bill of health.

---
Measured 2026-08-09 by tashan (https://tashan.sh) from public evidence. Scorer s5.