Agent Skills
› sediman-agent/OpenSkynet
› fix-merge-conflicts
fix-merge-conflicts
GitHub自动检测并解决Git合并冲突，通过最小化编辑和保留双方逻辑确保正确性，重新生成锁文件，验证构建与测试，最后提交结果并输出决策摘要。
Trigger Scenarios
分支存在未解决的合并冲突
需要非交互式地恢复可构建状态
Install
npx skills add sediman-agent/OpenSkynet --skill fix-merge-conflicts -g -y
SKILL.md
Frontmatter
{
"name": "fix-merge-conflicts",
"description": "Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution"
}
Fix merge conflicts
Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
Workflow
- Detect all conflicting files from git status and conflict markers.
- Resolve each conflict with minimal, correctness-first edits.
- Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
- Regenerate lockfiles with package manager tools instead of hand-editing.
- Run compile, lint, and relevant tests.
- Stage resolved files and summarize key decisions.
Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
Output
- Files resolved
- Notable resolution choices
- Build/test outcome
Version History
- c9d8953 Current 2026-07-05 19:51
