resolving-merge-conflicts
Skill5 starsChanged 4 months agoMITView on GitHub
ใช้เมื่อต้อง resolve merge/rebase conflict ของ git ที่ค้างอยู่ระหว่างทาง
138 other projects use a version of this.
Adopted by
Most recently taken up by
- The-Vibe-Company/quivrtheir own version, first seen Nov 8, 2026
- dfirmin/compasstheir own version, first seen Nov 8, 2026
- kazemcodes/skill-treetheir own version, first seen Nov 8, 2026
- ValorVie/custom-skillstheir own version, first seen Nov 8, 2026
- Tresnanda/kyberntheir own version, first seen Nov 8, 2026
- HarryMtv/create-frontstacktheir own version, first seen Nov 8, 2026
Used with
Projects with it also use decision-mapping and to-questionnaire.
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
AWSSkillto-questionnaire
Turn a decision you can't fully answer into a questionnaire for someone else to fill in.
Also in 47 projects that use this
Other versions138 projects use a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 138
- QuivrHQ/quivr★ 40ksame name
- The-Vibe-Company/quivr★ 40ksame name
- bestofjs/bestofjs★ 3.1ksame name
- crbnos/carbon★ 2.8ksame name
- CelestoAI/SmolVM★ 1.2ksame name
- moeru-ai/xsai★ 667same name
- nodetool-ai/nodetool★ 615same name
- stevesolun/ctx★ 583same name
- aws/graph-explorer★ 490same name
- hcloud-talos/terraform-hcloud-talos★ 362same name
128 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 repository39 other files it gives its agents.
- CLAUDE.mdCLAUDE.md
- design-an-interfaceSkill
- qaSkill
- request-refactor-planSkill
- ubiquitous-languageSkill
- 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
- claude-handoffSkill
- loop-meSkill
- setup-ts-deep-modulesSkill
- wizardSkill
- writing-beatsSkill
- writing-fragmentsSkill
- writing-shapeSkill
- git-guardrails-claude-codeSkill
- migrate-to-shoehornSkill
- scaffold-exercisesSkill
- setup-pre-commitSkill
- edit-articleSkill
- obsidian-vaultSkill
- grillingSkill
- grill-meSkill
- handoffSkill
- teachSkill
- writing-great-skillsSkill
The file
Files
- ดูสถานะปัจจุบัน ของ merge/rebase เช็ค git history และไฟล์ที่ conflict
- หาแหล่งข้อมูลต้นทาง ของแต่ละ conflict ทำความเข้าใจให้ลึกว่าแต่ละการเปลี่ยนแปลงถูกทำไปทำไม และเจตนาดั้งเดิมคืออะไร อ่าน commit message เช็ค PR เช็ค issue/ticket ต้นทาง
- Resolve ทีละ hunk รักษาเจตนาของทั้งสองฝั่งไว้ถ้าเป็นไปได้ ถ้าเข้ากันไม่ได้ ให้เลือกฝั่งที่ตรงกับเป้าหมายที่ประกาศไว้ของ merge แล้วจดบันทึก trade-off ไว้ ห้าม สร้างพฤติกรรมใหม่ขึ้นมาเอง ต้อง resolve เสมอ; ห้าม
--abortเด็ดขาด - หา automated checks ของโปรเจกต์แล้วรัน — ปกติคือ typecheck ตามด้วย test แล้วค่อย format แก้ทุกอย่างที่ merge ทำพัง
- จบ merge/rebase ให้เรียบร้อย stage ทุกอย่างแล้ว commit ถ้าเป็นการ rebase ให้ rebase ต่อไปจนครบทุก commit
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.