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.
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 resolve ~/.claude/skills/- Adoption: 1 repos
- Upkeep: 81.0
- Freshness: 98.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
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:aiecee/resolve
Already running this? npx tashan-cli doctor checks your whole config against the Index — how it works ›
Measured 2026-08-05 · scorer s5 · how · something wrong here?