# Resolve

> Resolves existing git conflict markers by inspecting the current conflict state, reading conflicted files, choosing safe resolutions, and editing files to remove normal or diff3 conflict markers. Use only when the repository is already in a conflicted merge, rebase, cherry-pick, revert, stash apply, or similar conflict state.

## Facts
- Page: https://tashan.sh/capability/skill-aiecee-resolve
- tashan id: skill:aiecee/resolve
- Source: https://github.com/aiecee/foundary
- Type: skill
- Category: devtools
- tashan score: not scored (catalogued only — too little public evidence)
- Adoption: 9.0
- Upkeep: 81.0
- Freshness: 98.0
- Evidence coverage: 84% of the inputs this score can use
- Health: active
- Instruction depth: not yet graded
- Official: no

## Install

```sh
cp -r resolve ~/.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-05 by tashan (https://tashan.sh) from public evidence. Scorer s5.