# resolving-merge-conflicts

Agent skill by Matt Pocock (https://www.totaltypescript.com)

For the moment you are mid-rebase with twelve conflicted files and no memory of what either side was trying to do. It reads both sides for intent rather than picking a hunk and moving on.

Topics: Delivery
Last updated: 2026-08-19 (28 days ago)
Source: https://github.com/mattpocock/skills
Repository: https://github.com/mattpocock/skills

## Install

```bash
npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflicts
```

## In the author's words

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

## Verification

- Source link: Resolved (HTTP 200) (pass)
- Repository: Resolves on GitHub (pass)
- Install command: Transcribed from the author's own page (pass)
- Maintenance: Last updated 28 days ago (pass)
- Attribution: Credited to Matt Pocock (pass)

Full page: https://stackskills.dev/library/resolving-merge-conflicts