跳至正文
OpenAgentSkill
浏览已开放 · 目录记录日期 2026-11-21 · 自动更新和账户服务暂时关闭。
开发与测试

conflicts

Resolve git merge or rebase conflicts and continue the operation. Use when a rebase, merge, or cherry-pick stops on conflicted files.

motlin · 已有静态检查记录

安装与使用

运行命令前先阅读来源与依赖说明。复制命令不会自动安装或执行。

npx skills add motlin/claude-code-plugins --skill conflicts

技能说明


name: conflicts description: Resolve git merge or rebase conflicts and continue the operation. Use when a rebase, merge, or cherry-pick stops on conflicted files.

Conflicts

Use the code:cli skill.

Run git status to see the operation in progress and the conflicted files. Resolve each file by keeping the correct side or combining both, and remove every conflict marker. Then:

git add <resolved-files>
git rebase --continue

If the rebase stops on more conflicts, repeat.

Finish by checking git status and recent commit history to confirm the operation completed.