resolving-merge-conflicts

Agent Skills › crbnos/carbon › resolving-merge-conflicts

GitHub

用于解决 Git 合并或变基过程中的冲突，通过分析冲突源、保留双方意图并修复自动化检查失败，最终完成提交。

.claude/skills/resolving-merge-conflicts/SKILL.md crbnos/carbon

Git merge conflict Git rebase conflict

npx skills add crbnos/carbon --skill resolving-merge-conflicts -g -y

更多选项

非标准路径

npx skills add https://github.com/crbnos/carbon/tree/main/.claude/skills/resolving-merge-conflicts -g -y

不安装直接使用

npx skills use crbnos/carbon@resolving-merge-conflicts

指定 Agent (Claude Code)

npx skills add crbnos/carbon --skill resolving-merge-conflicts -a claude-code -g -y

安装 repo 全部 skill

npx skills add crbnos/carbon --all -g -y

预览 repo 内 skill

npx skills add crbnos/carbon --list

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.