@warpdotdev/resolve-merge-conflicts

Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.

View in AI SkillSafe app
6 scan findings
0 downloads
0 stars
0 demos
SKILL.md

Embed badges

Add these to your README to show the skill's verification status.

SkillSafe verified badge
Verified badge
[![SkillSafe verified badge](https://api.skillsafe.ai/v1/badge/@warpdotdev/resolve-merge-conflicts/verified)](https://skillsafe.ai/skill/@warpdotdev/resolve-merge-conflicts/)
Installs badge
Installs badge
[![Installs badge](https://api.skillsafe.ai/v1/badge/@warpdotdev/resolve-merge-conflicts/installs)](https://skillsafe.ai/skill/@warpdotdev/resolve-merge-conflicts/)
Scan badge
Scan badge
[![Scan badge](https://api.skillsafe.ai/v1/badge/@warpdotdev/resolve-merge-conflicts/scan)](https://skillsafe.ai/skill/@warpdotdev/resolve-merge-conflicts/)
Eval pass rate badge
Eval pass rate
[![Eval pass rate badge](https://api.skillsafe.ai/v1/badge/@warpdotdev/resolve-merge-conflicts/eval)](https://skillsafe.ai/skill/@warpdotdev/resolve-merge-conflicts/)