Merge Conflict Resolution

Merge Conflict Resolution is a DevOps skill for Claude Code, published by stevesolun in ctx.

578 stars71 forkson stevesolun/ctxAdded 2026/08/25+1% in starsRepository updated 2026/08/24

agentsai-agentsanthropicautomationclaudeclaude-codecontext-managementdeveloper-toolsharnessknowledge-graphllmllm-wikimcpmicro-skillsobsidianreal-timerecommendation-engineskill-managementskillswiki

Install in seconds

Install Merge Conflict Resolution

Copy Merge Conflict Resolution into your Claude Code skills folder. Run the command in your terminal, or review the source on GitHub before installing.

terminal

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

Requires Node.js. Downloads this skill only — not the rest of the repository — into your Claude Code skills folder.

Without Node.js

git clone https://github.com/stevesolun/ctx.git

Clones the whole repository, then copy the skill’s own directory into your skills folder yourself.

In this catalog

Source file: .agents/skills/resolving-merge-conflicts/SKILL.md in stevesolun/ctx
Installs to: ~/.claude/skills/resolving-merge-conflicts
Collection: One of 25 skills cataloged from this repository
Category: DevOps — 798 skills

What Merge Conflict Resolution does

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.

Merge Conflict Resolution is cataloged under DevOps on DirSkills. Merge Conflict Resolution comes from a repository tagged agents, ai-agents, anthropic, automation and claude.

Documentation

README

Excerpt

Resolve Merge Conflicts

Inspect the current Git state, the operation in progress, its goal, and every conflicting file.
Reconstruct each side's intent from the code, nearby tests, history, commit messages, and linked work items that are available and useful.
Resolve each hunk by preserving compatible intent. Where intents conflict, prefer the merge's stated goal and current repository contracts; avoid inventing unrelated behavior.
Run focused checks for the affected surface, then broader checks when risk or repository guidance warrants them.
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.

This is the opening of the README. Read the full README on GitHub.

Frequently asked about Merge Conflict Resolution

What else does stevesolun publish alongside Merge Conflict Resolution?
Merge Conflict Resolution is one of 25 skills that DirSkills catalogs from stevesolun/ctx, the repository it ships in. Its siblings there include Ask Matt, Code Review and Codebase Design. Each one is a separate skill with its own page in this directory, installs the same way Merge Conflict Resolution does, and is maintained by stevesolun in that same repository. The rest of the collection is listed on the stevesolun/ctx page.
How does Merge Conflict Resolution compare to other DevOps skills?
Merge Conflict Resolution ranks #663 by stars among the 798 DevOps skills in this catalog. The most-starred ones next to it are Backend Patterns, API Connector Builder and Migration. DirSkills ranks by the star count of the repository each skill ships in, so that order reflects how popular those repositories are rather than any review of Merge Conflict Resolution against them. Open each page to compare what they document and how they install.