resolving-merge-conflicts

Agent Skills › biersoeckli/QuickStack › resolving-merge-conflicts

GitHub

解决 Git 合并或变基冲突。步骤包括分析冲突文件、查阅提交记录理解意图、保留双方逻辑或按目标取舍、运行自动化检查修复问题，最后完成合并或变基并提交。

.agents/skills/resolving-merge-conflicts/SKILL.md biersoeckli/QuickStack

遇到 git merge 冲突遇到 git rebase 冲突

npx skills add biersoeckli/QuickStack --skill resolving-merge-conflicts -g -y

More Options

Non-standard path

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

Use without installing

npx skills use biersoeckli/QuickStack@resolving-merge-conflicts

指定 Agent (Claude Code)

npx skills add biersoeckli/QuickStack --skill resolving-merge-conflicts -a claude-code -g -y

安装 repo 全部 skill

npx skills add biersoeckli/QuickStack --all -g -y

预览 repo 内 skill

npx skills add biersoeckli/QuickStack --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.