---
name: Merge Conflict Resolution
slug: merge-conflict-resolution
category: DevOps
description: Merge Conflict Resolution resolves an in-progress Git merge or rebase by inspecting both sides, preserving the intended changes, and checking the result. Use it when conflict markers or an interrupted operation need careful repair.
github: "https://github.com/stevesolun/ctx/tree/main/.agents/skills/resolving-merge-conflicts"
language: Python
stars: 578
forks: 71
install: "npx degit https://github.com/stevesolun/ctx/tree/main/.agents/skills/resolving-merge-conflicts ~/.claude/skills/resolving-merge-conflicts"
installs_to: ~/.claude/skills/resolving-merge-conflicts
source_path: .agents/skills/resolving-merge-conflicts/SKILL.md
collection_size: 25
category_size: 798
collection_url: "https://dirskills.com/collections/stevesolun/ctx"
added: 2026-08-25T05:14:03.895Z
last_synced: 2026-08-25T05:14:03.895Z
canonical_url: "https://dirskills.com/skills/merge-conflict-resolution"
---

# Merge Conflict Resolution

Merge Conflict Resolution resolves an in-progress Git merge or rebase by inspecting both sides, preserving the intended changes, and checking the result. Use it when conflict markers or an interrupted operation need careful repair.

**Install:**

```bash
npx degit https://github.com/stevesolun/ctx/tree/main/.agents/skills/resolving-merge-conflicts ~/.claude/skills/resolving-merge-conflicts
```

## README

# Resolve Merge Conflicts

1. Inspect the current Git state, the operation in progress, its goal, and every
   conflicting file.
2. Reconstruct each side's intent from the code, nearby tests, history, commit
   messages, and linked work items that are available and useful.
3. Resolve each hunk by preserving compatible intent. Where intents conflict,
   prefer the merge's stated goal and current repository contracts; avoid
   inventing unrelated behavior.
4. Run focused checks for the affected surface, then broader checks when risk or
   repository guidance warrants them.
5. Unless the user requested advice or review only, stage resolved files and
   continue the current merge or rebase when it is safe to do so. Report what was
   resolved, what was verified, and any remaining uncertainty.

Pause rather than guess when neither intent can be preserved safely. Aborting or
restarting can be the correct recovery when the base is wrong, the operation is
contaminated, or the user prefers a clean retry; explain the trade-off before
taking that destructive step.