---
title: "resolving-merge-conflicts"
type: entity
tags: [catalog, invocation, intermediate, well-established]
created: 2026-08-02
updated: 2026-11-09
sources: ["raw/github_doc-skills-engineering-resolving-merge-conflicts-skill-md.md", "raw/github_release-v1-3-0-2026-11-09.md"]
confidence: high
skills_snapshot: "2ab958093e83e0ec752e6c1c5932da465bf23e0c"
---

# resolving-merge-conflicts

> **Removed in v1.3.0.** Install v1.3.0 or later and this skill is gone from the plugin, the README and the `ask-matt` routes, with no successor; resolve merge and rebase conflicts with the agent directly. The aihero.dev docs page remains online as an archive (`https://aihero.dev/skills-resolving-merge-conflicts`). The rest of this page describes v1.2.3 and earlier.

## Overview

`resolving-merge-conflicts` is a five-step procedure for resolving an in-progress git merge or rebase conflict, grounded in understanding the original intent behind each conflicting change before touching a hunk.

## Characteristics

**Model-invoked** (through v1.2.3) — no `disable-model-invocation` flag; used when the user needs to resolve an in-progress git merge/rebase conflict. Acts directly on the repo's working tree and git history; produces no dedicated output files.

## How to Use

(1) **See the current state** of the merge/rebase — check git history and the conflicting files. (2) **Find the primary sources** for each conflict — commit messages, PRs, original issues/tickets — to understand deeply why each change was made and its original intent. (3) **Resolve each hunk**, preserving 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. (4) **Discover the project's automated checks** and run them — typically typecheck, then tests, then format — fixing anything the merge broke. (5) **Finish the merge/rebase** — stage everything and commit; if rebasing, continue the rebase process until all commits are rebased. Always resolve; never `--abort`.

## Related Entities

- [[entities/tdd]] — the automated checks this skill re-runs overlap with the test discipline it protects.
- [[entities/code-review]] — a natural follow-up once a conflicted branch is resolved and ready to land.
- [[entities/ask-matt]] — routed to this skill through v1.2.3; no longer does since v1.3.0.
- [[entities/promoted-catalog]] — full inventory.
