Menu
Use when a git merge or rebase reports conflicts and the operation is in progress.
The review-first prompt is selected by default. You can switch to a direct command or download a local copy.
Read SKILL.md and any companion files shown by SkillsMP before deciding whether to install.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
A direct command skips the review prompt. Inspect the source before running it.
npx skills add https://github.com/romiluz13/cc10x --skill resolving-merge-conflictsThe command stays on one line. Scroll horizontally to inspect it before copying.
Prefer a local copy? Download the files currently available to SkillsMP.
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. Use this skill when: the user asks ABOUT cc10x — "what is cc10x", "how do I configure cc10x", "why isn't cc10x activating", "how do cc10x workflows work", "how does cc10x memory work", "cc10x troubleshooting". NOT for performing work: "set up cc10x for me", build, debug, review, or plan requests route to cc10x-router. "Update cc10x" / "upgrade cc10x" route to the update skill. This skill answers questions; it never edits project code, never writes files, never runs workflows. Triggers: what is cc10x, cc10x help, cc10x guide, how to use cc10x, configure cc10x, cc10x setup, cc10x faq, cc10x troubleshooting, cc10x not working, cc10x not activating.
Greenfield architecture design: map functionality flows, draw components, design APIs, classify dependencies, plan observability. For multi-component, API, schema, auth, or integration-heavy work. For retrofitting existing code, use codebase-hygiene instead.
Use 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. Also use when the user says "update docs", "sync docs", "document this", or asks whether documentation is up to date.
Based on SOC occupation classification
Showing SKILL.md
| 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 |
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.
Check git status, the conflicting files, and the conflict markers:
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/).
For each conflict hunk, understand why each change was made and what its original intent was — don't just pick the bigger diff. Read:
git log --oneline -5 -- <file> for each side)For each hunk:
Discover the project's checks and run them in order — typically typecheck, then tests, then format:
# 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.
Stage everything and commit:
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.
grep -rn '^<<<<<<< \|^=======$\|^>>>>>>> ' . must return nothing before you commit.