Resolving Merge Conflicts

Resolving Merge Conflicts is a DevOps skill for Claude Code, published by romiluz13 in cc10x.

164 stars25 forkson romiluz13/cc10xAdded 2026/09/08Repository updated 2026/08/03

agent-harnessclaude-codeclaude-code-plugincontext-engineeringharness-engineeringllm-agentsloop-engineeringorchestrationtest-honesty

Install in seconds

Install Resolving Merge Conflicts

Copy Resolving Merge Conflicts 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/romiluz13/cc10x/tree/main/plugins/cc10x/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/romiluz13/cc10x.git

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

In this catalog

Source file: plugins/cc10x/skills/resolving-merge-conflicts/SKILL.md in romiluz13/cc10x
Installs to: ~/.claude/skills/resolving-merge-conflicts
Collection: One of 21 skills cataloged from this repository
Category: DevOps — 1075 skills

What Resolving Merge Conflicts does

Resolving Merge Conflicts helps you work through an in-progress git merge or rebase conflict hunk by hunk. Use it when you need to inspect both sides, resolve by intent, run checks, and finish the merge or rebase.

Resolving Merge Conflicts is cataloged under DevOps on DirSkills. Resolving Merge Conflicts comes from a repository tagged agent-harness, claude-code, claude-code-plugin, context-engineering and harness-engineering.

Documentation

README

Excerpt

git status
git diff --name-only --diff-filter=U   # the unmerged paths

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

Frequently asked about Resolving Merge Conflicts

What else does romiluz13 publish alongside Resolving Merge Conflicts?
Resolving Merge Conflicts is one of 21 skills that DirSkills catalogs from romiluz13/cc10x, the repository it ships in. Its siblings there include Agent Common, Architecture and Building. Each one is a separate skill with its own page in this directory, installs the same way Resolving Merge Conflicts does, and is maintained by romiluz13 in that same repository. The rest of the collection is listed on the romiluz13/cc10x page.
How does Resolving Merge Conflicts compare to other DevOps skills?
Resolving Merge Conflicts ranks #1003 by stars among the 1075 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 Resolving Merge Conflicts against them. Open each page to compare what they document and how they install.