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.

h3y6e Updated 0 repo stars

File contents

h3y6e/agent-skills commit 078dd767ef

Frequently asked questions

npx get-skill add h3y6e/resolve-merge-conflicts