resolving-merge-conflicts
Skill11 starsChanged 41 days agoMITView on GitHub
Use when you need to resolve an in-progress git merge/rebase conflict.
Files
- See the current state of the merge/rebase. Check git history, and the conflicting files.
- Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
- Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. - Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
- Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Other versions135 projects use a version of this.
Word for word · 41
- QuivrHQ/quivr★ 40k100% same
- crbnos/carbon★ 2.8k100% same
- moeru-ai/xsai★ 665100% same
- iamyoki/qwen-image-2.1-skill★ 116100% same
- Dimon94/dverity★ 107100% same
- Dimon94/skills★ 107100% same
- VoDaiLocz/kilo-kit-mcp★ 28100% same
- JianFeiGan/agent_part★ 17100% same
- anomaliaso/anomalia★ 16100% same
- kriscard/Skills★ 15100% same
31 more not listed
Edited · 76
- bestofjs/bestofjs★ 3.1k100% same
- CelestoAI/SmolVM★ 1.1k85% same
- aws/graph-explorer★ 489100% same
- udecode/better-convex★ 452100% same
- hcloud-talos/terraform-hcloud-talos★ 362100% same
- ninehills/skills★ 280100% same
- loulanyue/skills★ 231100% same
- tt-a1i/matt-skills-with-to-goal★ 19284% same
- ahonn/dotfiles★ 62100% same
- applypack/applypack★ 3077% same
66 more not listed
Wrote their own version · 18
- nodetool-ai/nodetool★ 603same name
- stevesolun/ctx★ 583same name
- GGGODLIN/gggodlin-cc-harness★ 73same name
- WenWuZhiDao/mattpocock-skills-zh★ 27same name
- axiomantic/spellbook★ 11same name
- imMamdouhaboammar/matts-skills-into-chatgpt★ 8same name
- Boom-Vitt/skills-thai★ 5same name
- dekoza/oh-my-slop★ 4same name
- icetomoyo/CodingSkills★ 4same name
- KroxiDev/engineering-skills★ 4same name
8 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.
Used alongsideProjects with it also use decision-mapping, setup-ts-deep-modules and 6 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.
FabienDehopreSkilldecision-mapping
Turn a loose idea into a sequenced map of investigation tickets, then drive them to resolution one at a time.
Also in 5 projects that use this
liufeng1976Skillsetup-ts-deep-modules
Wire dependency-cruiser into a TypeScript repo so each package is a deep module — implementation hidden in subfolders, reachable only through its entry-point files. User-invoked.
Also in 26 projects that use this
ryotaroh180105Skillclaude-handoff
Hand the current conversation off to a fresh background agent that picks up the work immediately.
Also in 26 projects that use this
LesaniSkillwriting-beats
Shape an article as a journey of beats, choose-your-own-adventure style. The user picks a starting beat from the raw material, you write only that beat, then offer options for where to pivot next, beat by beat, until the article reaches a natural end. Use when the user has raw material and wants to assemble it as a narrative rather than an argument.
Also in 30 projects that use this
- LesaniSkill
writing-fragments
Grilling session that mines the user for fragments — heterogeneous nuggets of writing (claims, vignettes, sharp sentences, half-thoughts) — and appends them to a single document as raw material for a future article. Use when the user wants to develop ideas before imposing structure, or mentions "fragments", "ideate", or "raw material" for writing.
Also in 30 projects that use this
simo97Skillmigrate-to-shoehorn
Migrate test files from `as` type assertions to @total-typescript/shoehorn. Use when user mentions shoehorn, wants to replace `as` in tests, or needs partial test data.
Also in 33 projects that use this
- +1 more from Lesani
In this repository95 other files it gives its agents.
- CLAUDE.mdCLAUDE.md
- ask-mattSkill
- brainstormingSkill
- cavecrewSkill
- caveman-commitSkill
- caveman-compressSkill
- caveman-helpSkill
- caveman-reviewSkill
- cavemanSkill
- caveman-statsSkill
- codebase-designSkill
- code-reviewSkill
- design-an-interfaceSkill
- diagnosing-bugsSkill
- dispatching-parallel-agentsSkill
- domain-modelingSkill
- executing-plansSkill
- finishing-a-development-branchSkill
- git-guardrails-claude-codeSkill
- grillingSkill
- grill-meSkill
- grill-with-docsSkill
- handoffSkill
- implementSkill
- implement-specSkill
- improve-codebase-architectureSkill
- loop-meSkill
- prototypeSkill
- receiving-code-reviewSkill
- requesting-code-reviewSkill
- researchSkill
- setup-matt-pocock-skillsSkill
- subagent-driven-developmentSkill
- systematic-debuggingSkill
- tddSkill
- teachSkill
- test-driven-developmentSkill
- to-questionnaireSkill
- to-specSkill
- to-ticketsSkill
- triageSkill
- using-git-worktreesSkill
- using-superpowersSkill
- verification-before-completionSkill
- wait-whatSkill
- wayfinderSkill
- wizardSkill
- writing-for-agentsSkill
- writing-great-skillsSkill
- writing-plansSkill
- writing-skillsSkill
- brainstormingSkill
- dispatching-parallel-agentsSkill
- executing-plansSkill
- finishing-a-development-branchSkill
- playwright-cliSkill
- receiving-code-reviewSkill
- requesting-code-reviewSkill
- subagent-driven-developmentSkill
- systematic-debuggingSkill
- 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.
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.