fix-merge-conflicts
Skill0 starsChanged 14 days agoMITView on GitHub
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
12 other projects use a version of this, 4 of them edited.
Adopted by
Most recently taken up by
- Yeachan-Heo/oh-my-claude-sisyphustheir own version, first seen Nov 8, 2026
- catesandrew/skillsedited, first seen Nov 8, 2026
- Yeachan-Heo/oh-my-claudecodetheir own version, first seen Nov 8, 2026
- Scino/fstackedited, first seen Oct 25, 2026
- jaydubya818/MissionControledited, first seen Oct 13, 2026
- dhanji4U/skillsedited, first seen Oct 2, 2026
Other versions12 projects use a version of this.
Word for word · 2
- cogine-ai/cogine-dev-skillset★ 4100% same
- ElyzeSolutions/skills★ 1100% same
Edited · 4
- Scino/fstack★ 1891% same
- dhanji4U/skills★ 279% same
- jaydubya818/MissionControl★ 272% same
- catesandrew/skills★ 180% same
Wrote their own version · 6
- Yeachan-Heo/oh-my-claude-sisyphus★ 41ksame name
- Yeachan-Heo/oh-my-claudecode★ 41ksame name
- cashew-labs/libretto★ 898same name
- saffron-health/libretto★ 883same name
- ulises-jeremias/agent-toolkit★ 19same name
- RoyBkker/agent-skills★ 1same 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 repository19 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- check-compiler-errorsSkill
- control-cliSkill
- control-uiSkill
- deslopSkill
- fix-ciSkill
- get-pr-commentsSkill
- loop-on-ciSkill
- make-pr-easy-to-reviewSkill
- new-branch-and-prSkill
- pr-review-canvasSkill
- review-and-shipSkill
- run-smoke-testsSkill
- thermo-nuclear-code-quality-reviewSkill
- verify-thisSkill
- weekly-reviewSkill
- what-did-i-get-doneSkill
- workflow-from-chatsSkill
The file
We split this skill into the rules it gives an agent
6 rules. 0 are common, 6 are distinctive, and 0 are very specific to this project.
0
Common
Most of the 10 edited versions we read keep these.
6
Distinctive
This author's own choices. Worth a look.
0
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Distinctive: line 16
Prefer preserving both sides when safe.
- Distinctive: line 18
Run compile, lint, and relevant tests.
- Distinctive: line 23
Keep changes minimal and readable.
- Distinctive: line 24
Do not leave conflict markers in any file.
- Distinctive: line 25
Avoid broad refactors while resolving conflicts.
- Distinctive: line 26
Do not push or tag during conflict resolution.
“Common” is measured: kept by at least 6 in 10 of the 10 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
Fix merge conflicts
Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
Workflow
- Detect all conflicting files from git status and conflict markers.
- Resolve each conflict with minimal, correctness-first edits.
- Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
- Regenerate lockfiles with package manager tools instead of hand-editing.
- Run compile, lint, and relevant tests.
- Stage resolved files and summarize key decisions.
Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
Output
- Files resolved
- Notable resolution choices
- Build/test outcome
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.