resolving-merge-conflicts

Agent Skills › CelestoAI/celesto › resolving-merge-conflicts

GitHub

用于解决 Git 合并或变基过程中产生的冲突。通过检查冲突文件、分析变更意图，保留双方逻辑并消除矛盾，随后运行自动化检查修复潜在问题，最终完成提交或继续变基流程。

.agents/skills/resolving-merge-conflicts/SKILL.md CelestoAI/celesto

Git merge conflict detected Git rebase conflict encountered

npx skills add CelestoAI/celesto --skill resolving-merge-conflicts -g -y

更多选项

非标准路径

npx skills add https://github.com/CelestoAI/celesto/tree/main/.agents/skills/resolving-merge-conflicts -g -y

不安装直接使用

npx skills use CelestoAI/celesto@resolving-merge-conflicts

指定 Agent (Claude Code)

npx skills add CelestoAI/celesto --skill resolving-merge-conflicts -a claude-code -g -y

安装 repo 全部 skill

npx skills add CelestoAI/celesto --all -g -y

预览 repo 内 skill

npx skills add CelestoAI/celesto --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.