New: 98,000+ skills indexed from GitHub repos with 100+ stars · every skill safety-checkedBrowse top skillsTop skills
Esc to closeBrowse all skills
Submit a skillBrowse skills
Submit a skillBrowse skills

Agent skill

Resolving Merge Conflicts

by romiluz13 in romiluz13/cc10x

A skill your agent uses when a git merge or rebase reports conflicts and the operation is in progress.

MITAuto-check: notesDevelopment

Install Resolving Merge Conflicts

skills CLI
$ npx skills add romiluz13/cc10x --skill resolving-merge-conflicts -a claude-code

Project install by default; add -g for ~/.claude/skills/.

GitHub CLI
$ gh skill install romiluz13/cc10x resolving-merge-conflicts --agent claude-code

Project scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).

Manual copy
$ git clone --depth 1 https://github.com/romiluz13/cc10x.git skills-src && mkdir -p .claude/skills && cp -r skills-src/plugins/cc10x/skills/resolving-merge-conflicts .claude/skills/resolving-merge-conflicts && rm -rf skills-src

Use ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.

Claude Code skills documentation · loads skills from .claude/skills/

Facts

Skill name
resolving-merge-conflicts
GitHub stars
164
Token cost
~709 tokens
SKILL.md length
300 words
Files
1
Skills in repo
22
Repo updated
First seen
Licence
MIT

At a glance

A skill your agent uses when a git merge or rebase reports conflicts and the operation is in progress.

  • Works in 5 steps: See the current state → Find the primary sources for each side → Resolve each hunk by intent → …
  • Rebase reports conflicts and the operation is in progress
  • SKILL.md covers The 5 steps and Before you commit
  • Calls git

What it does

Resolving Merge Conflicts is an agent skill from romiluz13/cc10x. Use when a git merge or rebase reports conflicts and the operation is in progress.

Its SKILL.md is about 710 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.

It sits in Development, covering Git workflow. It works with Git. The repository describes itself as: The Loop Engine for Claude Code — engineer the loop, not the prompt. 1 router · 9 agents · 16 skills · 4 workflows. Fail-closed gates, test honesty, anti-anchored review. The licence is MIT.

When your agent uses it

  • Rebase reports conflicts and the operation is in progress
  • Tasks that involve Git workflow

Example prompts

  • “/resolving-merge-conflicts”

Requirements

  • Python 3
  • Node.js
  • Pre-approved tools (allowed-tools): Read, Bash, Grep, Glob

Workflow steps

5 steps, taken from the step headings in SKILL.md.

  1. See the current state
  2. Find the primary sources for each side
  3. Resolve each hunk by intent
  4. Run the project's automated checks
  5. Finish the merge/rebase

What it can do on your machine

Read from SKILL.md and the folder at commit f346ebe. It shows what the files ask for, not the result of running them.

  • Tool permissions

    Pre-approves these tools, so the agent can use them without asking each time:

    • Read
    • Bash
    • Grep
    • Glob

    From allowed-tools in the SKILL.md frontmatter.

  • Runs code

    Shell commands in SKILL.md call:

    • git

    From the folder's file list and the shell code blocks in SKILL.md.

  • Network

    No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.

    From URLs in SKILL.md, links to its own repository left out.

  • Credentials

    Names no API keys, tokens, secrets or passwords.

    From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.

Context cost

Resolving Merge Conflicts loads about 709 tokens when it runs. Until then it costs about 27 tokens; SKILL.md has 300 words of instructions outside code blocks.

Always · name and description, kept in context so the agent knows when to use it
~27
When it runs · the whole SKILL.md, loaded when a task matches
~709

Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.

Safety

Auto-check: notes

The automated check noted patterns worth knowing about, such as sudo or a known installer.

  • NotePre-approves every shell command (allowed-tools: Bash)SKILL.md
    allowed-tools: Read, Bash, Grep, Glob

Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.

SKILL.md

The full file from romiluz13/cc10x at commit f346ebe, republished under its MIT licence (© romiluz13). 300 words, ~709 tokens.

Download SKILL.mdSave it as .claude/skills/resolving-merge-conflicts/SKILL.md (or your agent's skills folder).
name
resolving-merge-conflicts
description
Use when a git merge or rebase reports conflicts and the operation is in progress.
allowed-tools
Read, Bash, Grep, Glob
user-invocable
false
<!-- Upstream: github.com/mattpocock/skills @ e9fcdf95 (skills/engineering/resolving-merge-conflicts)
     Classification: ADAPTED (cc10x frontmatter + output conventions; 5-step body is Matt's). -->

Resolving Merge Conflicts

Work through an in-progress git merge or rebase conflict hunk by hunk, resolving each by intent traced to each side's primary source. Never --abort. Always resolve; --abort throws away work and hides the real incompatibility.

The 5 steps

1. See the current state

Check git status, the conflicting files, and the conflict markers:

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

Read each conflicting file's conflict markers (<<<<<<<, =======, >>>>>>>) to see exactly what's contested. Know whether you're in a merge (MERGE_HEAD set) or a rebase (rebase-merge/ or rebase-apply/ present in .git/).

2. Find the primary sources for each side

For each conflict hunk, understand why each change was made and what its original intent was — don't just pick the bigger diff. Read:

  • The commit messages on both sides (git log --oneline -5 -- <file> for each side)
  • The PRs or issues/tickets the commits reference
  • The surrounding code to confirm what each side was trying to achieve
3. Resolve each hunk by intent

For each hunk:

  • Preserve both intents where possible — the two sides usually want different things; merge both.
  • Where incompatible, pick the one matching the merge's stated goal (the feature, the fix, the branch's purpose) — never pick one side blind — and note the trade-off in the commit message: what was given up and why.
  • Never invent new behavior. A conflict resolution is not a place to add new code neither side wrote.
4. Run the project's automated checks

Discover the project's checks and run them in order — typically typecheck, then tests, then format:

bash
# node: npx tsc --noEmit (or per package.json scripts)
# python: ruff check . && python -m pytest -q
# go: go build ./... && go test ./...

Fix anything the merge broke. A conflict resolution that breaks the build is not a resolution.

5. Finish the merge/rebase

Stage everything and commit:

bash
git add <resolved-files>
git commit   # merge: completes the merge commit
# rebase: git rebase --continue (repeat for each conflicted commit until done)

If rebasing, continue the rebase process until ALL commits are rebased.

Before you commit

  • Never leave conflict markers in a committed file. grep -rn '^<<<<<<< \|^=======$\|^>>>>>>> ' . must return nothing before you commit.

© romiluz13, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file

Files

Just SKILL.md in plugins/cc10x/skills/resolving-merge-conflicts of romiluz13/cc10x.

Open the folder on GitHubat commit f346ebe

Compare with similar skills

Resolving Merge Conflicts next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.

Resolving Merge Conflicts compared with similar skills
SkillStarsUsed inTokensAuto-checkLicenceRepo updated
Resolving Merge Conflicts this skillromiluz13/cc10x164—~709Automated safety check: NotesMIT
Finishing a Development Branchobra/superpowers297k5 repos~1.9kAutomated safety check: PassMIT
Code Design Rationale Investigatorcursor/plugins10k9 repos~2.6kAutomated safety check: PassNone
Contributor-First PR MergeHKUDS/OpenHarness16k1 repos~847Automated safety check: PassMIT
Migrate Internal Package into GhostTryGhost/Ghost56k—~3.8kAutomated safety check: PassMIT
Create Pull Requestcline/cline70k1 repos~1.6kAutomated safety check: PassApache-2.0

Similar skills

  • Finishing a Development Branch

    obra/superpowers

    Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.

    297k GitHub starsUsed in 5 repos~1.9k tokens
    DevelopmentAuto-check passed

  • Code Design Rationale Investigator

    cursor/plugins

    Official

    Digs into why code is shaped the way it is by checking git history, pull requests and connected tools in parallel, then reporting a cited read on the tradeoffs.

    10k GitHub starsUsed in 9 repos~2.6k tokens
    DevelopmentAuto-check passed

  • Contributor-First PR Merge

    HKUDS/OpenHarness

    Merges external GitHub pull requests while keeping the original author credited, and fixes conflicts after the merge instead of rewriting the contribution.

    16k GitHub starsUsed in 1 repo~847 tokens
    DevelopmentAuto-check passed

  • Migrate Internal Package into Ghost

    TryGhost/Ghost

    Moves a package from another TryGhost repository into Ghost as an internal workspace package while keeping its Git history, with checkpoints for the steps that need an administrator.

    56k GitHub stars~3.8k tokensUpdated today
    DevelopmentAuto-check passed

  • Create Pull Request

    cline/cline

    Opens a GitHub pull request from your current branch with the gh CLI, after reviewing the commits and diff and gathering the details the PR needs.

    70k GitHub starsUsed in 1 repo~1.6k tokens
    DevelopmentAuto-check passed

  • Git Merge Conflict Resolver

    tailcallhq/forgecode

    Resolves Git merge conflicts with a plan-first workflow that keeps both sides' intent, regenerates lock files and backs up deleted-but-modified files.

    7.6k GitHub starsUsed in 1 repo~4.5k tokens
    DevelopmentAuto-check passed

More from romiluz13/cc10x

All 22 skills in this repo

  • Building

    romiluz13/cc10x

    A skill your agent uses when writing production code test-first: the RED-GREEN-REFACTOR cycle, false-RED detection, vertical slicing, scope escalation, test process discipline, and code generation…

    164 GitHub stars~2.7k tokensUpdated 2 days ago
    Auto-check: notes

  • Diff Driven Docs

    romiluz13/cc10x

    A skill your agent uses when a BUILD phase completes, a commit is staged, or a PR is about to be created, and the diff has not yet been reflected in documentation.

    164 GitHub stars~2.7k tokensUpdated 2 days ago
    Auto-check: notes

  • Planning

    romiluz13/cc10x

    A skill your agent uses when writing an execution plan or a decision RFC: task decomposition, context references, validation levels, risk-based testing, ADR format, plan completeness gate, and…

    164 GitHub stars~2.1k tokensUpdated 2 days ago
    Auto-check passed

  • Verification

    romiluz13/cc10x

    A skill your agent uses when judging whether a task reached its goal, not just finished: the gate function, self-critique gate, validation levels, evidence array protocol, and goal-backward lens.

    164 GitHub stars~1.9k tokensUpdated 2 days ago
    Auto-check: notes

  • Agent Common

    romiluz13/cc10x

    A skill your agent uses when a cc10x agent starts a task: the shared preamble for the memory protocol, the contract format, and the output rules.

    164 GitHub stars~2k tokensUpdated 2 days ago
    Auto-check passed

  • Cc10x Guide

    romiluz13/cc10x

    Answers questions about cc10x itself — what it is, how to install and configure it, how the router, workflows, memory, and hooks operate, and how to troubleshoot.

    164 GitHub stars~2.2k tokensUpdated 2 days ago
    Auto-check passed

Works with

Categories

Questions about Resolving Merge Conflicts

What does Resolving Merge Conflicts do?

A skill your agent uses when a git merge or rebase reports conflicts and the operation is in progress. Resolving Merge Conflicts is an agent skill from romiluz13/cc10x. Use when a git merge or rebase reports conflicts and the operation is in progress.

When should I use Resolving Merge Conflicts?

Resolving Merge Conflicts fits situations like: rebase reports conflicts and the operation is in progress; tasks that involve Git workflow.

How do I install Resolving Merge Conflicts in Claude Code?

Run `npx skills add romiluz13/cc10x --skill resolving-merge-conflicts -a claude-code`. Or copy the skill folder (plugins/cc10x/skills/resolving-merge-conflicts in romiluz13/cc10x) into .claude/skills/resolving-merge-conflicts in your project. Claude Code loads it when a task matches its description.

How do I install Resolving Merge Conflicts in Codex?

Run `npx skills add romiluz13/cc10x --skill resolving-merge-conflicts -a codex`. Or copy the skill folder (plugins/cc10x/skills/resolving-merge-conflicts in romiluz13/cc10x) into .agents/skills/resolving-merge-conflicts in your project. Codex loads it when a task matches its description.

Can I use Resolving Merge Conflicts in Cursor, Gemini CLI or GitHub Copilot?

Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add romiluz13/cc10x --skill resolving-merge-conflicts -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/resolving-merge-conflicts, .gemini/skills/resolving-merge-conflicts, .github/skills/resolving-merge-conflicts and .opencode/skills/resolving-merge-conflicts in your project.

What does Resolving Merge Conflicts need to run?

Going by SKILL.md and its folder, Resolving Merge Conflicts needs the command-line tools its instructions call (git). Our summary lists: Python 3; Node.js. Its frontmatter pre-approves these tools: Read, Bash, Grep, Glob.

Does Resolving Merge Conflicts access the network?

SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.

Is Resolving Merge Conflicts safe to install?

Our automated static check of SKILL.md found notes only (pre-approves every shell command (allowed-tools: bash)), nothing it rates as a warning. It is not a guarantee. Review the folder before installing.

What licence does Resolving Merge Conflicts use?

Resolving Merge Conflicts is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.

How many tokens does Resolving Merge Conflicts use?

About 709 tokens (SKILL.md is roughly 2.8k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.

What are the alternatives to Resolving Merge Conflicts?

Skills that share tags, products or a category with Resolving Merge Conflicts: Finishing a Development Branch (obra/superpowers, 297k stars), Code Design Rationale Investigator (cursor/plugins, 10k stars), Contributor-First PR Merge (HKUDS/OpenHarness, 16k stars) and Migrate Internal Package into Ghost (TryGhost/Ghost, 56k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.

Who maintains Resolving Merge Conflicts?

romiluz13 (a GitHub user) maintains it in romiluz13/cc10x, which has 164 GitHub stars. The repository holds 22 skills in this directory. The repository was last updated on October 7, 2026.

Source: romiluz13/cc10x on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.