# Resolving Merge Conflicts

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

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

- Page: https://ss33.ai/skills/george-rd/resolving-merge-conflicts-44934896745
- Publisher: george-rd
- Category: [Software Development](https://ss33.ai/skills/category/software-development-t44z8z) › [Source control & code review](https://ss33.ai/skills/category/software-development-t44z8z/source-control-and-code-review-jebezw)
- License: MIT
- Source: https://github.com/george-rd/design-studio/blob/d29ed0a54f366e665aa00f03f9271f94d66d7bf8/.agents/skills/resolving-merge-conflicts/SKILL.md

## Skill

SKILL.md: https://ss33.ai/api/v1/ss33/download/george-rd/resolving-merge-conflicts-44934896745

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.