resolving-merge-conflicts
Skill40k starsChanged 40 days agoMITView on GitHub
Use when you need to resolve an in-progress git merge/rebase conflict.
144 other projects use a version of this, 84 of them edited; 2 new projects in the last 4 weeks, against 3 the 4 before.
Adopted by
Cooling: 2 new projects took it in the last 4 weeks, 0.7× the 4 weeks before.thin data
Most recently taken up by
- atiq-r/skillsedited, first seen Nov 16, 2026
- richard12511/claude-skillsedited, first seen Nov 16, 2026
- lhotwll217/owner-operatoredited, first seen Nov 16, 2026
- RSickenberg/programmatic-resumeword for word, first seen Nov 15, 2026
- geoffbremner/skillsedited, first seen Nov 15, 2026
- quickchatai/quickreviewedited, first seen Nov 15, 2026
Who's talking about The-Vibe-Company/quivr
- Kimz“39.6k Stars:把內容串流變成可監控知識庫的開源引擎”YouTube · Oct 27, 2026 · 4 views
- @golangoss.bsky.social“quivr (⭐️ 39614) An open-source engine that turns continuous content streams into search and monitoring. …”Bluesky · Oct 29, 2026 · 1 likes
- Kimerd“Turn Content Streams Into Searchable Monitored Knowledge”YouTube · Oct 27, 2026 · 1 views
- @golangoss.bsky.social“quivr (⭐️ 39585) An open-source engine that turns continuous content streams into search and monitoring. …”Bluesky · Oct 14, 2026 · 1 likes
- @golangoss.bsky.social“quivr (⭐️ 39603) An open-source engine that turns continuous content streams into search and monitoring. …”Bluesky · Oct 26, 2026
The biggest 5 of 7 mentions linking to the repository that our crawl found. Each line is their own headline.
See all 7
Talked about on Bluesky, YouTube and the web (7 times).
On Bluesky · 3
- Oct 29, 2026quivr (⭐️ 39614) An open-source engine that turns continuous content streams into search and monitoring. Durable ingestion, hybrid search,… — @golangoss.bsky.social1 likes and repost
- Oct 14, 2026quivr (⭐️ 39585) An open-source engine that turns continuous content streams into search and monitoring. Durable ingestion, hybrid search,… — @golangoss.bsky.social1 likes and repost
- Oct 26, 2026quivr (⭐️ 39603) An open-source engine that turns continuous content streams into search and monitoring. Durable ingestion, hybrid search,… — @golangoss.bsky.social0 likes and reposts · 1 reply
On YouTube · 2
- Oct 27, 202639.6k Stars:把內容串流變成可監控知識庫的開源引擎 — Kimz4 views
- Oct 27, 2026Turn Content Streams Into Searchable Monitored Knowledge — Kimerd1 view
On the web · 2
- Oct 30, 2026The-Vibe-Company/Quivr v2.0.1 on GitHub — newreleases.io
- Sep 19, 2023The-Vibe-Company/Quivr v0.0.76 on GitHub — newreleases.io
Used with
Projects with it also use setup-ts-deep-modules, decision-mapping and 8 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.
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 30 projects that use this
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
richard12511Skillclaude-handoff
Hand the current conversation off to a fresh background agent that picks up the work immediately.
Also in 31 projects that use this
RoentekSkillloop-me
Grill me about specs for the workflows I want to build, within this workspace.
Also in 35 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 35 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 38 projects that use this
Other versions144 projects use a version of this.
Word for word · 43
- QuivrHQ/quivr★ 40k100% same
- crbnos/carbon★ 2.8k100% same
- moeru-ai/xsai★ 669100% same
- iamyoki/qwen-image-2.1-skill★ 116100% same
- Dimon94/dverity★ 107100% same
- Dimon94/skills★ 107100% same
- Tresnanda/kybern★ 92100% same
- kinlace/parent-recap★ 48100% same
- VoDaiLocz/kilo-kit-mcp★ 27100% same
- JianFeiGan/agent_part★ 17100% same
33 more not listed
Edited · 84
- bestofjs/bestofjs★ 3.1k100% same
- CelestoAI/SmolVM★ 1.5k85% same
- mdiri-ai/SoduWork★ 93045% same
- aws/graph-explorer★ 492100% same
- hcloud-talos/terraform-hcloud-talos★ 364100% same
- ninehills/skills★ 280100% same
- loulanyue/skills★ 231100% same
- tt-a1i/matt-skills-with-to-goal★ 19284% same
- HarryMtv/create-frontstack★ 103100% same
- ahonn/dotfiles★ 62100% same
74 more not listed
Wrote their own version · 17
- nodetool-ai/nodetool★ 637same name
- stevesolun/ctx★ 583same name
- GGGODLIN/gggodlin-cc-harness★ 74same name
- WenWuZhiDao/mattpocock-skills-zh★ 27same name
- axiomantic/spellbook★ 13same name
- imMamdouhaboammar/matts-skills-into-chatgpt★ 8same name
- Boom-Vitt/skills-thai★ 5same name
- dekoza/oh-my-slop★ 4same name
- KroxiDev/engineering-skills★ 4same name
- stenalpjolly/llm-skills★ 4same name
7 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 repository46 other files it gives its agents.
- AGENTS.mdAGENTS.md
- quivr-search/AGENTS.mdAGENTS.md
- sdks/AGENTS.mdAGENTS.md
- armada-coordinatorSkill
- armada-runtime-claude-codeSkill
- armada-runtime-conductorSkill
- armada-runtime-herdrSkill
- armada-workerSkill
- ask-mattSkill
- audit-tests-devSkill
- better-uiSkill
- capture-learning-toolsSkill
- codebase-designSkill
- code-reviewSkill
- coordinate-fleetSkill
- design-frontend-devSkill
- diagnosing-bugsSkill
- documentation-writerSkill
- domain-modelingSkill
- emil-design-engSkill
- grillingSkill
- grill-meSkill
- grill-with-docsSkill
- handoffSkill
- humanizerSkill
- implementSkill
- improve-codebase-architectureSkill
- mermaid-diagramsSkill
- mintlifySkill
- plan-prSkill
- prototypeSkill
- researchSkill
- review-code-devSkill
- setup-matt-pocock-skillsSkill
- ship-pr-devSkill
- tddSkill
- teachSkill
- to-questionnaireSkill
- to-specSkill
- to-ticketsSkill
- triageSkill
- wait-whatSkill
- wayfinderSkill
- wizardSkill
- writing-docsSkill
- writing-for-agentsSkill
The file
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.
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.

