resolving-merge-conflicts
Skill2.8k starsChanged yesterdayLicence not identifiedView 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 crbnos/carbon
- A Hacker News story“Show HN: I've been building an ERP for manufacturing for the last 3 years”Hacker News · Aug 4, 2025 · 322 points
- A Hacker News story“Show HN: A technique for better Claude Code results”Hacker News · Aug 5, 2025 · 3 points
- @github-trending-js.bsky.social“📦 crbnos / carbon ⭐ 2,013 (+79) 🗒 TypeScript Carbon is an open source ERP, MES and QMS for manufacturing. …”Bluesky · Apr 20, 2026 · 1 likes
- @tom-doerr.bsky.social“https://github.com/crbnos/carbon”Bluesky · Apr 18, 2026 · 1 likes
- @tom-doerr.bsky.social“https://github.com/crbnos/carbon”Bluesky · Sep 8, 2025 · 1 likes
The biggest 5 of 12 mentions linking to the repository that our crawl found. Each line is their own headline.
See all 12
Talked about on Bluesky, GitHub and Hacker News (12 times).
On Bluesky · 6
- Apr 20, 2026📦 crbnos / carbon ⭐ 2,013 (+79) 🗒 TypeScript Carbon is an open source ERP, MES and QMS for manufacturing. Perfect for complex assembly,… — @github-trending-js.bsky.social1 likes and repost
- Apr 18, 2026https://github.com/crbnos/carbon — @tom-doerr.bsky.social1 likes and repost
- Sep 8, 2025https://github.com/crbnos/carbon — @tom-doerr.bsky.social1 likes and repost
- Aug 5, 2025Show HN: I've been building an ERP for manufacturing for the last 3 years | Discussion — @hackernewsbot.bsky.social1 likes and repost
- Aug 10, 2025ショーHN:私はこの3年間、製造業のためのERPを構築してきました。 Show HN: I've been building an ERP for manufacturing for the last 3 years 🔺 320 💬 37 🔗 HN Post |… — @hacker-news-jp.bsky.social0 likes and reposts · 1 reply
1 more on Bluesky
- Aug 7, 2025Show HN: I've been building an ERP for manufacturing for the last 3 years View Article | Join the HN Conversation Summary of HN discussion… — @hncompanion.com0 likes and reposts · 1 reply
On GitHub · 4
- Oct 27, 2026[Candidate] crbnos/carbon/.claude/skills/test-driven-development - test-driven-development — ProSkillsMD/proskills0 reactions · 1 comment
- Sep 11, 2026Sync upstream 85d9006e11 (2026-09-11) — saturnrobotics/carbon0 reactions
- Feb 17, 2026Stage 5: contract sync automation and breakage detection — masch-services-team/carbon-sdk0 reactions
- Aug 5, 2025HN Top Posts 2025-08-05 — EFLql/hackernews-daily0 reactions
On Hacker News · 2
- Aug 4, 2025Show HN: I've been building an ERP for manufacturing for the last 3 years322 points · 158 comments
- Aug 5, 2025Show HN: A technique for better Claude Code results3 points
Used with
Projects with it also use setup-ts-deep-modules, decision-mapping and 10 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 28 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
RoentekSkillloop-me
Grill me about specs for the workflows I want to build, within this workspace.
Also in 33 projects that use this
ryotaroh180105Skillclaude-handoff
Hand the current conversation off to a fresh background agent that picks up the work immediately.
Also in 28 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 32 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 35 projects that use this
Other versions144 projects use a version of this.
Word for word · 43
- QuivrHQ/quivr★ 40k100% same
- The-Vibe-Company/quivr★ 40k100% same
- moeru-ai/xsai★ 667100% 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★ 362100% 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 repository37 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- agent-browserSkill
- authSkill
- carbon-designSkill
- carbon-docsSkill
- changelog-entrySkill
- check-and-commitSkill
- conductorSkill
- create-agents-mdSkill
- debugging-difficult-bugsSkill
- errorSkill
- executeSkill
- explainSkill
- featureSkill
- fixSkill
- grillSkill
- improveSkill
- inngestSkill
- make-interfaces-feel-betterSkill
- planSkill
- pr-explainerSkill
- pr-splitterSkill
- researchSkill
- root-causeSkill
- rust-best-practicesSkill
- rustSkill
- self-reviewSkill
- smoke-testSkill
- spec-writingSkill
- supabase-postgres-best-practicesSkill
- tddSkill
- test-driven-developmentSkill
- testSkill
- translateSkill
- uiSkill
- writing-skillsSkill
The file
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.

