resolve-merge-conflicts
resolve merge conflicts
What it does
- Take one side wholesale with git checkout --ours -- path/to/file or git checkout --theirs -- path/to/file when appropriate.
- Otherwise edit the file directly and remove the conflict markers.
- Read more of the file only if the compact output is not enough to decide the correct merge.
- Ensure no unmerged paths remain.
- Ensure no <<<<<<<, =======, or >>>>>>> markers remain in the resolved files.
- Run targeted tests, builds, or linters for the touched area.
- Stage the resolved files.
Derived from the skill's own SKILL.md documentation · extracted 2026-07-23
resolve-merge-conflicts FAQ
What does the resolve-merge-conflicts skill do?
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. Take one side wholesale with git checkout --ours -- path/to/file or git checkout --theirs -- path/to/file when appropriate. Otherwise edit the file directly and remove the conflict markers.
How do I install resolve-merge-conflicts?
Run: npx -y skills add https://github.com/warpdotdev/common-skills --skill resolve-merge-conflicts --agent claude-code — the source lives at github.com/warpdotdev/common-skills.
Maintain resolve-merge-conflicts?
Let people know it's listed here — add the badge (live metrics, light/dark aware) or a plain link to your README or docs.
[](https://getagentictools.com/skills/warpdotdev-common-skills-resolve-merge-conflicts?ref=badge) npx agentictools info skills/warpdotdev-common-skills-resolve-merge-conflicts The second line is the CLI lookup for this page — handy in READMEs and docs.
