fix-merge-conflicts
Skill2 starsChanged 8 months agoMITView on GitHub
Use when a branch needs conflicts resolved and the merged result verified.
We split this skill into the rules it gives an agent
6 rules. 2 are common, 4 are distinctive, and 0 are very specific to this project.
2
Common
Most of the 9 edited versions we read keep these.
4
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 25
Prefer preserving both sides when safe.
- Distinctive: line 27
Run compile, lint, and relevant tests.
- Common: line 32
Keep changes minimal and readable.
- Common: line 33
Do not leave conflict markers in any file.
- Distinctive: line 34
Avoid broad refactors while resolving conflicts.
- Distinctive: line 35
Do not push or tag during conflict resolution.
“Common” is measured: kept by at least 6 in 10 of the 9 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
Other versions10 projects use a version of this.
Word for word · 0
None found.
Edited · 5
- Scino/fstack★ 1882% same
- cogine-ai/cogine-dev-skillset★ 487% same
- dhanji4U/skills★ 271% same
- ElyzeSolutions/skills★ 187% same
- ArchitektApx/cursor-skills-for-claude★ 087% same
Wrote their own version · 5
- cashew-labs/libretto★ 898same name
- saffron-health/libretto★ 883same name
- ulises-jeremias/agent-toolkit★ 19same name
- jimyag/dotfiles★ 11same 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.
Used alongsideProjects with it also use loop-on-ci, check-compiler-errors and 2 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.
cogine-aiSkillloop-on-ci
Monitor PR checks and fix failures until green. Uses gh pr checks as the source of truth for PR-attached checks.
Also in 4 projects that use this
- cogine-aiSkill
check-compiler-errors
Run compile and type-check commands and report failures
Also in 3 projects that use this
MicrosoftSkillrun-smoke-tests
Run smoke tests to verify extension functionality in a real VS Code environment. Use this when checking if basic features work after changes.
Also in 3 projects that use this
- +1 more from cogine-ai
In this repository93 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- .cursor/rules/code-simplifier.mdcCursor rule
- .cursor/rules/tdd-verification.mdcCursor rule
- ckm:banner-designSkill
- ckm:brandSkill
- ckm:designSkill
- ckm:design-systemSkill
- ckm:slidesSkill
- ckm:ui-stylingSkill
- ui-ux-pro-maxSkill
- mission-control-agent-integrationSkill
- agent-watchdogSkill
- architectSkill
- arenaSkill
- automate-meSkill
- babysitSkill
- before-and-afterSkill
- blast-radiusSkill
- broSkill
- code-structureSkill
- create-verification-skillSkill
- deslopSkill
- evidence-driven-testingSkill
- factory-babysit-prSkill
- factory-collectSkill
- factory-human-digestSkill
- factory-lookbackSkill
- factory-recoverSkill
- factory-review-prsSkill
- factory-shipSkill
- factorySkill
- factory-watchdogSkill
- figure-it-outSkill
- fix-ciSkill
- get-pr-commentsSkill
- greploop-appsSkill
- greploopSkill
- howSkill
- interrogateSkill
- maintain-verification-skillSkill
- make-pr-easy-to-reviewSkill
- mission-control-budget-controlSkill
- mission-control-deliverySkill
- mission-control-heartbeatSkill
- mission-control-record-memorySkill
- mission-control-register-agentSkill
- mission-control-request-approvalSkill
- mission-control-run-loggingSkill
- mission-control-submit-deliverableSkill
- mission-control-task-lifecycleSkill
- new-featureSkill
- no-commentsSkill
- plan-arbiterSkill
- poteto-modeSkill
- principle-attack-the-premiseSkill
- principle-boundary-disciplineSkill
- principle-build-the-leverSkill
- principle-encode-lessons-in-structureSkill
- principle-exhaust-the-design-spaceSkill
- The first 60 shown.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
Reviews can't be read right now.
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.