resolving-merge-conflicts

Agent Skills › Alain00/blobatar › resolving-merge-conflicts

GitHub

解决 Git merge 或 rebase 冲突的技能。通过分析冲突文件、理解变更意图，合并保留双方逻辑，运行自动化检查修复问题，最终完成提交或继续变基流程。

.agents/skills/resolving-merge-conflicts/SKILL.md Alain00/blobatar

Git merge 出现冲突 Git rebase 遇到冲突

npx skills add Alain00/blobatar --skill resolving-merge-conflicts -g -y

More Options

Non-standard path

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

Use without installing

npx skills use Alain00/blobatar@resolving-merge-conflicts

指定 Agent (Claude Code)

npx skills add Alain00/blobatar --skill resolving-merge-conflicts -a claude-code -g -y

安装 repo 全部 skill

npx skills add Alain00/blobatar --all -g -y

预览 repo 内 skill

npx skills add Alain00/blobatar --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.