Borrowing it
Nothing to install: this file belongs to BeWaterMyFriend7/SKILL-PROJECT. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.
curl -O https://raw.githubusercontent.com/BeWaterMyFriend7/SKILL-PROJECT/main/.opencode/skills/code-merge-helper/SKILL.mdgit clone --depth 1 https://github.com/BeWaterMyFriend7/SKILL-PROJECTWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/skills/bewatermyfriend7/skill-project/code-merge-helper)<a href="https://agentmods.dev/skills/bewatermyfriend7/skill-project/code-merge-helper"><img src="https://agentmods.dev/badge/skills/bewatermyfriend7/skill-project/code-merge-helper/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/skills/bewatermyfriend7/skill-project/code-merge-helper"><img src="https://agentmods.dev/badge/skills/bewatermyfriend7/skill-project/code-merge-helper.svg" alt="Reviewed on agentmods" width="80" height="20"></a>- NVIDIA SkillSpector pass
What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00028 | $0.01037 |
| Opus 5 | $0.00014 | $0.00518 |
| Sonnet 5 | $0.00006 | $0.00207 |
| Haiku 4.5 | $0.00003 | $0.00104 |
Grade A, and why
code-merge-helper scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 9d ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
What it actually says
Code Merge Helper
分析 Git 合并冲突，提供可执行的解决方案。
原则： 只分析 → 不改代码 → 等待审批
核心流程
1. 识别冲突
- 哪些文件冲突了？
- 冲突点是什么？
2. 追溯原因
- 两边为什么改？
- 改动的目的是什么？
3. 评估方案
- 保留谁的改动？
- 能否合并两边？
4. 分析影响
- 会影响哪些功能？
- 需要什么验证？
5. 输出报告
- 文件：.code/merge-review/合并分析-YYYYMMDD-HHMMSS.md
- 状态：等待审批
输出报告（简洁版 - 5 章）
报告包含 5 个核心部分：
| 部分 | 内容 | 为什么需要 |
|---|---|---|
| 1️⃣ 冲突概览 | 冲突文件、类型、风险、方案 | 快速了解情况 |
| 2️⃣ 冲突分析 | 三方对比、推荐方案、理由 | 理解改动原因 |
| 3️⃣ 操作步骤 | Bash 命令序列 | 可直接执行 |
| 4️⃣ 验证清单 | Checkbox 验证列表 | 质量保证 |
| 5️⃣ 风险与回滚 | 风险评估、回滚命令 | 应急预案 |
报告语义化
输出文件名示例：
.code/merge-review/合并feature-login到main-20260704-150230.md
.code/merge-review/合并hotfix-payment到release-20260704-161520.md
控制台输出示例：
✓ 合并冲突分析报告已生成
【操作】将 feature/login 合并到 main
【冲突】3 个文件（高风险 1 个）
【方案】语义融合（保留两边改动）
【决策】Redis 版本需确认
【状态】等待审批
文件：.code/merge-review/合并feature-login到main-20260704-150230.md
请审核报告后按操作步骤执行。
调用方式
/code-merge-helper
分析当前 merge 冲突，生成报告，不修改代码。
分析规则
生成报告时遵守以下规则：
- 只分析不改代码 - 生成分析报告，不修改任何代码文件
- 使用简洁模板 - 使用 5 章结构（assets/merge-resolution-report.md）
- 初始状态 - 审批状态必须为
WAITING_FOR_APPROVAL - 三方对比 - 分析 common-base、stage-2、stage-3 的差异
- 追溯提交 - 查看提交历史，理解改动目的
- 推荐方案可执行 - 提供具体的代码或操作步骤
- 风险分级 - 使用 🔴 高 / ⚠️ 中 / ✅ 低 标记
- 人工决策突出 - 需要人工确认的问题明确标注
- 验证步骤可执行 - 提供具体的验证命令
- 提供回滚方案 - 给出具体的回滚命令
- 使用直观格式 - Emoji + 表格 + 代码块
- 避免过度设计 - 不使用复杂的 ID 体系和追踪矩阵
- 人类友好 - 用人话描述，避免技术黑话
方案类型
推荐方案通常是以下几种之一：
- 保留 stage-2 - 保留当前分支的改动
- 保留 stage-3 - 保留合入分支的改动
- 语义融合 - 保留两边改动，合并语义
- 需人工决策 - 两边改动冲突，需要人工选择
工具
- 写入工具：
scripts/write_utf8.py（确保 UTF-8 编码） - 验证工具：
scripts/validate_merge_plan.py（检查方案完整性）
详细文档
assets/merge-resolution-report.md- 简洁报告模板references/analysis-rules.md- 分析规则references/git-command-reference.md- Git 命令参考references/verification-matrix.md- 验证矩阵
What ships with it
11 files beside SKILL.md in the same directory: the scripts, references and assets a skill reads on demand. Not counted in the per-session cost; read them before you install if any of them is executable.
- assets/merge-resolution-report.md 3.2 KB
- references/analysis-rules.md 4.3 KB
- references/git-command-reference.md 1.2 KB
- references/verification-matrix.md 1.6 KB
- requirements.txt 73 B
- scripts/check_utf8.py 2.2 KB runs code
- scripts/encoding_reference.md 1.8 KB
- scripts/README.md 2.4 KB
- scripts/skill_structure_guide.md 1.8 KB
- scripts/validate_merge_plan.py 15 KB runs code
- scripts/write_utf8.py 4.9 KB runs code
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 9d ago First seen · 117 lines · 28 tokens per session scan A 4d0869957f86
code-merge-helper is a skill published in the GitHub repository BeWaterMyFriend7/SKILL-PROJECT (51 stars, last pushed yesterday), licensed Apache-2.0. It adds 28 tokens to every session and 1,037 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.
Other skills, from other repositories
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
comet-github
A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.
github-skill
Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.
re0-merge
Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…
nvca-chart-release
Release NVCA Operator chart changes from the native monorepo source to the vendored Helm chart. Use when updating the vendored NVCA Operator chart, changing NVCA image refs, publishing helm-nvca-operator, or validating the chart against a self-managed control plane.