resolving-merge-conflicts
GitHub用于解决 Git 合并或变基过程中的冲突。通过审查历史、PR 和提交信息理解变更意图，保留原始目的并解决冲突块，运行自动化检查修复潜在问题，最后完成合并或变基操作。
Trigger Scenarios
Install
npx skills add FradSer/dotclaude --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.
CRITICAL: Preserve intent, never invent
Understand the original intent of each change before resolving it. Do not invent new behaviour; where intents conflict, pick the one matching the merge's stated goal and note the trade-off. 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
- 9815c4f Current 2026-09-28 12:04
- 6f2a0b2 2026-08-20 11:00
