resolving-merge-conflicts
Skill27 starsChanged 3 months agoMITView on GitHub
在你需要解决一个进行中的 git merge/rebase 合并冲突时使用。
Files
- 查看 merge/rebase 的当前状态。检查 git 历史，以及有冲突的文件。
- 为每个冲突找到主要来源。深入理解每处变更为何做出，以及原始意图是什么。阅读 commit 消息、查看 PR、查看原始的 issue/工单。
- 解决每个 hunk。 在可能之处保留双方的意图。当不兼容时，选择与本次 merge 所声明目标相符的那个，并记下权衡。不要 发明新行为。始终解决冲突；永不
--abort。 - 发现项目的 自动化检查 并运行它们——通常是类型检查，然后测试，然后格式化。修复 merge 破坏的任何东西。
- 完成 merge/rebase。 暂存所有内容并提交。如果是 rebase，继续 rebase 过程，直到所有 commit 都完成 rebase。
Other versions134 projects use a version of this.
Word for word · 0
None found.
Edited · 1
- addie-ace/dsh-mattpocock-skills★ 014% same
Wrote their own version · 133
- QuivrHQ/quivr★ 40ksame name
- bestofjs/bestofjs★ 3.1ksame name
- crbnos/carbon★ 2.8ksame name
- CelestoAI/SmolVM★ 1.1ksame name
- moeru-ai/xsai★ 665same name
- nodetool-ai/nodetool★ 603same name
- stevesolun/ctx★ 583same name
- aws/graph-explorer★ 489same name
- udecode/better-convex★ 452same name
- hcloud-talos/terraform-hcloud-talos★ 362same name
123 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.
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
In this repository36 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- ask-mattSkill
- codebase-designSkill
- code-reviewSkill
- diagnosing-bugsSkill
- domain-modelingSkill
- grill-with-docsSkill
- implementSkill
- improve-codebase-architectureSkill
- prototypeSkill
- researchSkill
- setup-matt-pocock-skillsSkill
- tddSkill
- to-specSkill
- to-ticketsSkill
- triageSkill
- wayfinderSkill
- wizardSkill
- claude-handoffSkill
- loop-meSkill
- setup-ts-deep-modulesSkill
- writing-beatsSkill
- writing-fragmentsSkill
- writing-shapeSkill
- git-guardrails-claude-codeSkill
- migrate-to-shoehornSkill
- scaffold-exercisesSkill
- setup-pre-commitSkill
- grillingSkill
- grill-meSkill
- handoffSkill
- teachSkill
- to-questionnaireSkill
- wait-whatSkill
- writing-for-agentsSkill
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.