Skip to main content
在 Manus 中运行任何 Skill
一键导入
$pwd:

fix-merge-conflicts

// Resolves merge conflicts conservatively and verifies the repo still builds. Use when the tree contains conflict markers or git reports unresolved merges.

$ git log --oneline --stat
stars:1
forks:1
updated:2026年4月8日 11:23
SKILL.md
readonly