resolving-merge-conflicts
GitHub指导如何安全解决 Git merge 或 rebase 冲突。包括检查状态、理解变更意图、保留双方逻辑并做出取舍、运行自动化检查修复潜在问题，最后完成合并或变基操作，确保代码库一致性。
Trigger Scenarios
Install
npx skills add ArcReel/ArcReel --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
- 44d22bf Current 2026-08-28 10:39
- 24a1f5c 2026-07-25 06:25
