ask-matt
免费Ask which skill or flow fits your situation. A router over the skills in this repo.
中文简介正在准备中。当前显示原文说明。
tt-a1i/matt-skills-with-to-goal1872026年10月10日 更新
免费在 GitHub 公开
resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict.
中文简介正在准备中。当前显示原文说明。
实测评分 未实测
查看安装方法包含的文件（2）
- SKILL.md1019 B
- agents/openai.yaml113 B
SKILL.md（原文）
安装前可以查看交给 AI 代理的指令内容。
-
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. Default to resolving; reach for
--abortonly when the two intents are irreconcilable and the right fix is restructuring the change. -
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.
评价
还没有评价。欢迎分享你的使用感受。
评论
无需登录即可发表。欢迎分享使用感受、提问，或说明在哪些环境下无法运行。
还没有评论。来写第一条吧。
同一仓库的技能
Hand the current conversation off to a fresh background agent that picks up the work immediately.
中文简介正在准备中。当前显示原文说明。
tt-a1i/matt-skills-with-to-goal1872026年10月10日 更新
Review the changes since a fixed point (commit, branch, tag, or merge-base) along two axes: Standards (does the code follow this repo's documented coding standards?) and Spec (does the code match what the originating issue/spec asked for?). Runs both reviews in parallel sub-agents and reports them side by side. Use when the user wants to review a branch, a PR, work-in-progress changes, or asks to "review since X".
中文简介正在准备中。当前显示原文说明。
tt-a1i/matt-skills-with-to-goal1872026年10月10日 更新
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.
中文简介正在准备中。当前显示原文说明。
tt-a1i/matt-skills-with-to-goal1872026年10月10日 更新
Diagnosis loop for hard bugs and performance regressions. Use when the user says "diagnose"/"debug this", or reports something broken/throwing/failing/slow.
中文简介正在准备中。当前显示原文说明。
tt-a1i/matt-skills-with-to-goal1872026年10月10日 更新
Build and sharpen a project's domain model. Use when discussing codebase terminology, writing or editing a GLOSSARY.md, or recording or editing an ADR.
中文简介正在准备中。当前显示原文说明。
tt-a1i/matt-skills-with-to-goal1872026年10月10日 更新