resolving-merge-conflicts

name	resolving-merge-conflicts
author	mattpocock
upstream	mattpocock/skills
upstreamPath	skills/engineering/resolving-merge-conflicts
upstreamSha	e9fcdf95b402d360f90f1db8d776d5dd450f9234
lastUpdated	2026-07-02T01:06:55.000Z
tags	["Coding","DevOps","Matt Pocock"]
description	Use when you need to resolve an in-progress git merge/rebase conflict.

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.