resolve-merge-conflicts
Skill2.1k starsChanged 5 months agoAGPL-3.0View on GitHub
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
We split this skill into the rules it gives an agent
8 rules. 0 are common, 6 are distinctive, and 2 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.
2
Very specific
Tied to their project's names, files or tools. Probably skip.
Licensed with conditions — read it at the source. We count its rules but don't quote them. Read them on GitHub.
“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.
Trending
Quiet since August.thin dataabout the whole repository
Who's talking about zerx-lab/warp
- jwp2987/phosphor“Brand leaks in user-visible surfaces: Zap logo on first run, ~/.warp paths, Software\\Zap registry”GitHub · Aug 29, 2026
- jwp2987/phosphor“"Send feedback" opens the dead ancestor repo, and eight doc links are empty strings”GitHub · Aug 29, 2026
- zerx-lab/zap“Update GitHub links to remove openWarp branch references”GitHub · May 3, 2026
- zerx-lab/zap“fix: 修正 desktop 文件 Exec 字段指向的可执行文件名称”GitHub · May 3, 2026
The biggest 4 of 4 mentions linking to the repository that our crawl found. Each line is their own headline.
Other versions12 projects use a version of this.
Word for word · 2
- zerx-lab/zap★ 2.1k100% same
- warpdotdev/common-skills★ 630100% same
Edited · 1
- zhouycheng/skills★ 1100% same
Wrote their own version · 9
- github/gh-aw★ 5.5ksame name
- Indium-AI-Labs/indium-agentkit★ 17same name
- Ionate-Technologies/indium-agentkit★ 17same name
- stealth-factory/skills★ 5same name
- igorkulman/pi-skills★ 3same name
- khgouldy/skills★ 1same name
- nortonx/ai-tooling-free★ 1same name
- Ronnasayd/aipp★ 1same name
- tejastn10/workbench★ 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 tdd.
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.
GoogleSkilltdd
Test-driven development. Use when the user wants to build features or fix bugs test-first, mentions "red-green-refactor", or wants integration tests.
Also in 3 projects that use this
In this repository20 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- add-feature-flagSkill
- add-telemetrySkill
- dedupe-issue-localSkill
- diagnose-ci-failuresSkill
- fix-errorsSkill
- implement-specsSkill
- promote-featureSkill
- remove-feature-flagSkill
- review-pr-localSkill
- review-prSkill
- rust-unit-testsSkill
- spec-driven-implementationSkill
- triage-issue-localSkill
- update-skillSkill
- warp-integration-testSkill
- warp-ui-guidelinesSkill
- write-product-specSkill
- write-tech-specSkill
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.

