resolving-merge-conflicts
GitHub指导解决 Git 合并或变基冲突。步骤包括：查看当前状态，查阅提交记录、PR 和 Issue 以理解变更意图；逐块解析冲突，保留双方意图或根据目标选择并记录权衡，禁止发明新行为或中止操作；运行类型检查、测试和格式化等自动化检查并修复问题；最后暂存文件并提交完成流程。
Trigger Scenarios
Install
npx skills add Remocn/remocn --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
- f77e19e Current 2026-07-19 22:37
