---
name: Resolving Merge Conflicts
slug: resolving-merge-conflicts
category: DevOps
description: Resolves in-progress git merge or rebase conflicts by identifying primary sources, preserving intent, and running automated checks. Use when you need to finish a merge or rebase without aborting.
github: "https://github.com/tt-a1i/matt-skills-with-to-goal/tree/main/skills/resolving-merge-conflicts"
language: Shell
stars: 14
forks: 3
install: "git clone https://github.com/tt-a1i/matt-skills-with-to-goal"
added: 2026-07-16T13:43:25.591Z
last_synced: 2026-07-18T04:41:58.387Z
canonical_url: "https://dirskills.com/skills/resolving-merge-conflicts"
---

# Resolving Merge Conflicts

Resolves in-progress git merge or rebase conflicts by identifying primary sources, preserving intent, and running automated checks. Use when you need to finish a merge or rebase without aborting.

**Install:** `git clone https://github.com/tt-a1i/matt-skills-with-to-goal`

## README

1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.

2. **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.

3. **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`.

4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.