resolving-merge-conflicts

---
name: resolving-merge-conflicts
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.

More agent context in microsoft/frontier-ghcp-rvas

32 other files this repository gives its agents.

Also found in 42 other repositories

The same file, byte for byte, in the weekly crawl of public GitHub; the 10 with the most stars.

• bestofjs/bestofjs3.1k
• aws/graph-explorer484
• udecode/better-convex450
• biersoeckli/QuickStack362
• hcloud-talos/terraform-hcloud-talos360
• ninehills/skills280
• loulanyue/skills231
• willdady/platypus115
• ahonn/dotfiles62
• lezli01/vincent28