---
name: asymmetric-al-resolving-merge-conflicts
description: "Use when you need to resolve an in-progress git merge/rebase conflict."
license: "AGPL-3.0"
metadata:
  decimalai-skill-id: "1ea26010-b444-4608-854f-7c9788b2959a"
  decimalai-version-id: "7b6951ea-be9d-40e3-8d79-4d501e8cbb5a"
  decimalai-version: "1"
  decimalai-body-sha256: "845cf97503ac97b4a8c8e231c35d9d81d826a8c63bfc1d8a886a81b0458dc684"
  decimalai-name: "asymmetric-al/resolving-merge-conflicts"
  decimalai-format: "1"
  decimalai-invocation: "model"
  decimalai-category: "coding"
  decimalai-source: "https://app.decimal.ai/s/asymmetric-al-resolving-merge-conflicts@1/SKILL.md"
---
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.