git-conflict-resolver
Skill50 starsChanged 21 days agoMITView on GitHub
Resolves git merge and rebase conflicts by reading both sides, keeping the intent of each change and verifying the result with tests. Use when a merge, rebase or cherry-pick stops with conflict markers, or when the user asks how to fix conflicts safely.
2 other projects use a version of this.
Adopted by
Most recently taken up by
- Baba01hacker666/dummyskillstheir own version, first seen Oct 13, 2026
- kimhons/Ralph-Loop-Ultratheir own version, first seen Jan 30, 2026
Other versions2 projects use a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 2
- kimhons/Ralph-Loop-Ultra★ 1same name
- Baba01hacker666/dummyskills★ 0same name
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 repository26 other files it gives its agents.
- api-endpoint-testerSkill
- changelog-generatorSkill
- commit-message-writerSkill
- cron-explainerSkill
- csv-profilerSkill
- docker-compose-reviewerSkill
- dockerfile-linterSkill
- env-file-auditorSkill
- incident-postmortem-writerSkill
- json-diffSkill
- jwt-inspectorSkill
- log-analyzerSkill
- markdown-link-checkerSkill
- meeting-notes-to-actionsSkill
- openapi-summarizerSkill
- pr-description-writerSkill
- python-code-smellsSkill
- readme-doctorSkill
- regex-explainerSkill
- release-checklistSkill
- requirements-auditorSkill
- secure-code-reviewSkill
- skill-authorSkill
- sql-query-reviewerSkill
- todo-extractorSkill
- unit-test-writerSkill
The file
We split this skill into the rules it gives an agent
6 rules. About 0 are common, 4 are distinctive, and 2 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈4
Distinctive · estimate
This author's own choices. Worth a look.
2
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- could be automatic: a setting could enforce it
- Distinctive: line 24
See the scope: Run git status and list the files marked as both modified.
- Very specific: line 34
Remove every marker: Run git grep -n -E '^(<<<<<<<|=======|>>>>>>>)' and expect no output.
- Distinctive: line 35
Verify: Run the build and the tests.
- Very specific: line 41
Do not use git checkout --theirs .
- Distinctive: line 42
Do not force push after a rebase on a shared branch without telling the user.
- Distinctive: line 52
If the intent of one side is unclear, ask the user or the author of the change instead of guessing.
≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Git conflict resolver
A conflict means two people changed the same lines. The goal is to keep what both wanted, not to make the markers disappear.
When to use
git merge,git rebaseorgit cherry-pickstops with "CONFLICT".- A file contains
<<<<<<<,=======and>>>>>>>markers. - The user is unsure whether to keep "ours" or "theirs".
Steps
- See the scope. Run
git statusand list the files marked as both modified. Note whether this is a merge or a rebase, because "ours" and "theirs" swap meaning during a rebase. - Understand both changes. For each file, run
git log --merge -p -- <file>or compare the two branches, and write one sentence for what each side was trying to do. - Resolve by intent. Combine the changes when both are needed. Pick one side only when the other is obsolete, and say why. Never delete a side silently.
- Handle special files.
- Lock files and generated files: do not edit by hand. Take one side, then regenerate with the package manager.
- Renames and deletes: check
git statusfor "deleted by us" or "deleted by them" and decide on purpose. - Whitespace-only conflicts: keep the project's formatter output.
- Remove every marker. Run
git grep -n -E '^(<<<<<<<|=======|>>>>>>>)'and expect no output. - Verify. Run the build and the tests. A conflict that compiles can still be wrong.
- Finish.
git add <files>, thengit merge --continueorgit rebase --continue. If it went badly,git merge --abortorgit rebase --abortreturns to the starting point.
Rules
- Do not use
git checkout --theirs .or--ours .on the whole tree. - Do not force push after a rebase on a shared branch without telling the user.
- Show the user the resolved hunks for any file where behavior changed.
Example
Both branches edited a function. One added a timeout parameter, the other renamed a variable. The resolution keeps
the rename and the new parameter, and the test that covers the function is run before git add.
Errors
If the intent of one side is unclear, ask the user or the author of the change instead of guessing.
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.

