resolving-merge-conflicts
GitHub指导在Git合并或变基冲突时，通过审查历史、PR及意图来源，合理保留双方逻辑并解决冲突，随后运行自动化检查修复问题并完成提交。
Trigger Scenarios
Install
npx skills add mattpocock/skills --skill resolving-merge-conflicts -g -y
SKILL.md
Frontmatter
{
"name": "resolving-merge-conflicts",
"description": "Use when you need to resolve an in-progress git merge\/rebase conflict."
}
-
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.
Version History
-
1bb9595
Current 2026-08-19 19:44
移除文档和元数据中的长破折号，替换为逗号、冒号等标点以优化阅读体验。
- ed37663 2026-07-24 15:57
