Resolving Merge Conflicts

Use when you need to resolve an in-progress git merge/rebase conflict.

1 minute · 120 words

See the current state of the merge/rebase. Check git history, and the conflicting files.
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge’s stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.
Discover the project’s automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Install this repository

$ npx skills add mattpocock/skills

» /plugin marketplace add mattpocock/skills

Skills install per repository, not per chapter — the CLI has no documented per-skill form, so we do not print one.

Colophon for this issue

Colophon

How this issue was made

Source: github.com/mattpocock/skills, branch main, last pushed 7 August 2026.
Licence: MIT — the text of every chapter is reproduced unmodified, frontmatter included, under the upstream licence.
Discovery: 35 chapters found by walking the repository tree for SKILL.md, not by matching a directory convention. 4 distinct layouts observed: skills/engineering/*/SKILL.md, skills/in-progress/*/SKILL.md, skills/misc/*/SKILL.md, skills/productivity/*/SKILL.md.
Issue colours: Resolved from a curated brand profile — hue 253°, chroma 0.140. Two accent tones are generated per issue and each is proven against its own ground before it ships: a single accent that passes AA on both light and dark paper is arithmetically impossible.
Heading repairs: None needed in this chapter: the outline was already valid.
Spec compliance: Every chapter satisfies the Agent Skills specification’s frontmatter rules.
Images: Images inside a chapter come from the upstream repository. Where the author gave no alternative text we mark the image decorative rather than inventing a description — a plausible caption we made up is worse than none for the reader who depends on it.
Marketplace: A plugin manifest is published at .claude-plugin/marketplace.json by Matt Pocock, declaring 1 plugin. It is read for editorial metadata only — never as the skill index, which is always the repository tree.
Signal: Install counts come from skills.sh. They measure downloads, not quality, and an unranked repository is not an unread one.
Agent surfaces: The whole issue is available as one markdown document at /mattpocock/skills.md, and each chapter at its own .md URL.
Publication: Set by Skills Docs from the source repository. Body text is Literata at the reader’s chosen size and measure; code is Geist Mono. Nothing on this page was written by us except this paragraph.

See the current state of the merge/rebase. Check git history, and the conflicting files.
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge’s stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.
Discover the project’s automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Resolving Merge Conflicts

Colophon

Resolving Merge Conflicts

Appendix 11.1

Also bundledYAML · 1 file

Colophon

Appendix 11.1

Also bundledYAML · 1 file