resolve-conflicts
Skill2 starsChanged 4 months agoMITView on GitHub
Walk through git merge, rebase, or cherry-pick conflicts — understand both sides, resolve each hunk correctly, and verify the result before continuing. Use when the user says "resolve merge conflicts", "fix these conflicts", "help me with this merge", "I have conflicts", "finish this rebase", or "git says conflicts".
16 other projects use a version of this.
Adopted by
Most recently taken up by
- domengabrovsek/agent-configtheir own version, first seen Nov 8, 2026
- domengabrovsek/claudetheir own version, first seen Nov 8, 2026
- LeonardiFranco/skillstheir own version, first seen Nov 8, 2026
- marinvch/Cortextheir own version, first seen Nov 1, 2026
- SantiagoVqz/claude-skillstheir own version, first seen Nov 1, 2026
- edloidas/skillstheir own version, first seen Nov 1, 2026
Used with
Projects with it also use worktrees, document and 7 more.
Other files people use alongside this one.
Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
nilecuiSkillworktrees
Guide for using git worktrees to parallelize development with coding agents. Use this skill when the user requests to work in a new worktree or wants to work on a separate feature in isolation (e.g., "Work in a new worktree", "Create a worktree for feature X").
Also in 3 projects that use this
nicolasestremSkilldocument
Create focused documentation for specific components or features
Also in 3 projects that use this
AWSSkillwizard
Generate an interactive bash wizard that walks a human through steps only they can perform. Use when provisioning infrastructure, setting up credentials or CI secrets, walking an unfamiliar third-party dashboard, or running a one-off migration or cutover. Don't invoke this for steps the agent can perform itself.
Also in 4 projects that use this
SentrySkillspec
Produce a verified spec — problem, desired outcome, and acceptance criteria — before building. Use when given a GitHub/Linear issue link, when starting from a fuzzy in-conversation idea, or asked to "figure out what to do" / "scope this" / "what should I build" — whenever the *what* isn't yet pinned down. Grills the ambiguities, checks the premise against the code, and produces acceptance criteria you sign off on — then hands to design-first.
Also in 4 projects that use this
BlockSkillplan
Draft a TDD, PRD, or lightweight plan in the conversation without committing it.
Also in 5 projects that use this
Microsoft AzureSkillbuild
Build the TypeSpec Rust emitter from source. Run this after cloning the repo, after pulling changes, or when TypeScript source files have been modified.
Also in 3 projects that use this
Other versions16 projects use a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 16
- domengabrovsek/agent-config★ 22same name
- domengabrovsek/claude★ 22same name
- mthines/agent-skills★ 20same name
- loremaster-ai/loremaster★ 4same name
- ralphkrauss/agent-orchestrator★ 4same name
- edloidas/skills★ 2same name
- SantiagoVqz/claude-skills★ 2same name
- LeonardiFranco/skills★ 1same name
- marinvch/Cortex★ 1same name
- nielsmadan/skills★ 1same name
6 more not listed
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository68 other files it gives its agents.
- a11ySkill
- api-docsSkill
- audit-logSkill
- benchmarkSkill
- bisectSkill
- cacheSkill
- changelogSkill
- cherry-pickSkill
- ci-setupSkill
- codeownersSkill
- commit-messageSkill
- connection-poolSkill
- contributingSkill
- coverageSkill
- db-migrateSkill
- dead-codeSkill
- debugSkill
- depsSkill
- diagramSkill
- dockerizeSkill
- docstringSkill
- e2eSkill
- env-exampleSkill
- error-handlingSkill
- explainSkill
- feature-flagSkill
- flaky-testSkill
- gitignoreSkill
- graceful-shutdownSkill
- graphqlSkill
- healthcheckSkill
- i18nSkill
- idempotencySkill
- licenseSkill
- lint-fixSkill
- loggingSkill
- migrateSkill
- mockSkill
- onboardSkill
- optimizeSkill
- paginationSkill
- pr-descriptionSkill
- pre-commitSkill
- profileSkill
- prune-branchesSkill
- rate-limitSkill
- readmeSkill
- rebaseSkill
- refactorSkill
- regexSkill
- releaseSkill
- retrySkill
- review-diffSkill
- scaffoldSkill
- secrets-scanSkill
- security-headersSkill
- seedSkill
- soft-deleteSkill
- sqlSkill
- squashSkill
- The first 60 shown.
The file
We split this skill into the rules it gives an agent
3 rules. 0 are common, 0 are distinctive, and 3 are very specific to this project.
0
Common
Most of the 16 edited versions we read keep these.
0
Distinctive
This author's own choices. Worth a look.
3
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Very specific: line 34
After resolving a file, git add <file> to mark it resolved.
- Very specific: line 39
Sanity-check the result builds/lints/tests: if a quick command exists — a clean merge that doesn't compile isn't resolved.
- Very specific: line 46
Don't git checkout/reset/abort to "clean up" without explicit confirmation — that can throw away the user's work.
“Common” is measured: kept by at least 6 in 10 of the 16 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Conflict state
!git status --short 2>/dev/null || echo "Not a git repository"
!git diff --name-only --diff-filter=U 2>/dev/null | sed 's/^/CONFLICTED: /' || true
!ls -d .git/rebase-merge .git/rebase-apply .git/MERGE_HEAD .git/CHERRY_PICK_HEAD 2>/dev/null | sed 's/^/IN-PROGRESS: /' || echo "No merge/rebase/cherry-pick in progress"
Instructions
Resolve the conflicted files listed above. Honor any preference in $ARGUMENTS (e.g. "prefer our version"). If there's no conflict in progress, say so and stop.
Orient first
- Identify the operation from the in-progress markers: a merge (
MERGE_HEAD), a rebase (rebase-merge/rebase-apply), or a cherry-pick. This changes what "ours" and "theirs" mean:- Merge:
ours= current branch (HEAD),theirs= the branch being merged in. - Rebase: roles are flipped —
ours= the upstream you're replaying onto,theirs= your commit being applied. Call this out so the user doesn't pick the wrong side.
- Merge:
- See what's diverging. For context, check what each side was doing:
git log --oneline --left-right HEAD...MERGE_HEAD(merge) or look at the commit being applied during a rebase.
Resolve each file
- Read the full conflicted file, not just the hunk — surrounding code reveals intent. Find every
<<<<<<</=======/>>>>>>>block. - Understand both sides before editing. What did each side intend to change, and why? Use
git log/git blameon the region if the reason isn't obvious. The goal is a result that preserves both intents, not a mechanical pick of one side. - Resolve by meaning, not by deletion. Usually you keep parts of both. Take one side wholesale only when they're genuinely mutually exclusive. Remove all conflict markers and leave syntactically valid code.
- Watch for semantic conflicts git can't see: both sides renamed the same thing differently, one side's change relies on code the other side moved or deleted, duplicate imports/definitions after merging. Re-read the merged region for these.
- After resolving a file,
git add <file>to mark it resolved.
Verify, then continue
- Confirm no markers remain:
git diff --checkand a grep for<<<<<<<across the resolved files. - Sanity-check the result builds/lints/tests if a quick command exists — a clean merge that doesn't compile isn't resolved. Hand off to the
lint-fixor test tooling if useful. - Continue the operation:
git merge --continue,git rebase --continue(repeat per replayed commit — a rebase can hit fresh conflicts on the next commit), orgit cherry-pick --continue. For a plain merge, a commit completes it.
Rules
- Never resolve by blindly taking one side unless the user said so or the sides are truly exclusive — silent data loss is the main hazard here. When unsure which intent wins, show the user both sides and ask.
- Remember rebase flips ours/theirs. Don't rely on
--ours/--theirsshortcuts unless you've confirmed which is which for the current operation. - Don't
git checkout/reset/abortto "clean up" without explicit confirmation — that can throw away the user's work. If things look wrong, explain the state and offergit merge --abort/git rebase --abortas a choice. - A rebase resolves one commit at a time; after
--continue, re-check status for the next conflict rather than assuming you're done. - Summarize what you changed per file, which intent you preserved, and the exact command run to continue (or what's left for the user to do).
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

