resolve-merge-conflicts
Installation
SKILL.md
resolve-merge-conflicts
Use this when Git reports unmerged paths or conflict markers. Start with unresolved paths and inspect one file at a time; open more context only when the compact view cannot establish the intended result.
Inspect
Run the helper for a summary, then drill into each conflicted file:
python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py
python3 .agents/skills/resolve-merge-conflicts/scripts/extract_conflict_context.py --file path/to/file
Use its ours/base/theirs sections and compact diff to decide the merge. It also covers index-only conflicts such as add/add and modify/delete. Take one side wholesale only when that is clearly correct; otherwise edit the file and remove all conflict markers.