菜单
Use when you need to resolve an in-progress git merge/rebase conflict, or when a merge, rebase, cherry-pick or pull leaves conflict markers. Spanish triggers: "conflicto", "conflictos", "resuelve el merge", "arregla el rebase", "tengo conflictos", "no puedo hacer merge".
默认使用会先检查来源的 Prompt；你也可以切换为直接命令，或下载本地副本。
决定是否安装前，请先阅读 SKILL.md，以及 SkillsMP 当前展示的配套文件。
用 Codex 或 Claude 帮你安装 复制这段 Prompt，粘贴到 Codex、Claude 或其他助手里，让它检查 Skill 页面并帮你完成安装。
直接命令不会经过审查 Prompt；运行前请先检查来源。
npx skills add https://github.com/astrxnomo/dotfiles --skill resolving-merge-conflicts命令会保持在同一行。复制前请横向滚动并检查完整内容。
想先保存到本地？可下载 SkillsMP 当前能够提供的文件。
Shared vocabulary for designing deep modules. Use when the user wants to design or improve a module's interface, find deepening opportunities, decide where a seam goes, make code more testable or AI-navigable, or when another skill needs the deep-module vocabulary. Spanish triggers: "arquitectura", "estructura del código", "cómo organizo", "dónde pongo", "refactor", "refactoriza", "acoplado", "separar responsabilidades", "capas", "módulo", "interfaz".
Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow. Spanish triggers: "no funciona", "está roto", "falla", "da error", "revienta", "tira error", "se cae", "no anda", "por qué no", "está lento", "diagnostica", "depura", "arregla el bug", "no me sale".
Build and sharpen a project's domain model — the CONTEXT.md glossary and the ADRs in docs/adr/. Use when the user wants to pin down domain terminology or a ubiquitous language, record an architectural decision, or when another skill needs to maintain the domain model. Spanish triggers: "glosario", "cómo llamamos a", "terminología", "nombres del dominio", "modelo de dominio", "documenta la decisión", "ADR", "deja constancia de por qué".
基于 SOC 职业分类
正在显示 SKILL.md
| name | resolving-merge-conflicts |
| description | Use when you need to resolve an in-progress git merge/rebase conflict, or when a merge, rebase, cherry-pick or pull leaves conflict markers. Spanish triggers: "conflicto", "conflictos", "resuelve el merge", "arregla el rebase", "tengo conflictos", "no puedo hacer merge". |
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.
