resolving-merge-conflicts
GitHub用于解决 Git 合并或变基过程中产生的冲突。通过检查状态、分析冲突来源及意图，在保留双方逻辑的前提下解决代码块，运行自动化检查修复潜在问题，最后完成提交或继续变基流程，严禁随意中止。
Trigger Scenarios
Install
npx skills add AjayIrkal23/agentic-mercy-10x --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
- 581d130 Current 2026-07-19 09:13
