Borrowing it
Nothing to install: this file belongs to asasugar/SuperSpec. 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/asasugar/SuperSpec/master/.cursor/skills/git-conflict-resolver/SKILL.mdgit clone --depth 1 https://github.com/asasugar/SuperSpecWrote 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/asasugar/superspec/git-conflict-resolver)<a href="https://agentmods.dev/skills/asasugar/superspec/git-conflict-resolver"><img src="https://agentmods.dev/badge/skills/asasugar/superspec/git-conflict-resolver/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/asasugar/superspec/git-conflict-resolver"><img src="https://agentmods.dev/badge/skills/asasugar/superspec/git-conflict-resolver.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.00107 | $0.01533 |
| Opus 5.5 | $0.00043 | $0.00613 |
| Sonnet 5.5 | $0.00021 | $0.00307 |
| Haiku 4.5 | $0.00011 | $0.00153 |
Grade A, and why
git-conflict-resolver 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 1mo 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.
How it starts
The opening of the file, as written. The whole thing — 181 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Git冲突解决器
自动检测、分析和解决Git分支合并冲突的工具集。
快速命令
| 场景 | 命令 |
|---|---|
| 检测冲突 | python scripts/detect_conflicts.py |
| 分析冲突 | python scripts/analyze_conflict.py <file> |
| 交互式解决 | python scripts/resolve_conflict_interactive.py <file> <ours|theirs|merge> |
| 批量解决 | python scripts/batch_resolve_interactive.py |
| 撤销解决 | git checkout --conflict=merge <file> |
工作流程
解决Git冲突的标准流程：
- 检测冲突 - 识别所有冲突文件
- 分析冲突 - 分析冲突类型和影响范围
- 选择策略 - 根据冲突类型选择解决策略
- 确认修改 - 每次修改前都会征询开发者同意，显示变更预览
- 解决冲突 - 执行解决操作
- 验证结果 - 确认冲突已解决
重要: 所有冲突解决操作都是交互式的，每次修改前都会：
- 显示变更预览（diff）
- 征询开发者同意
- 只有确认后才应用更改
检测冲突
使用 scripts/detect_conflicts.py 检测当前仓库中的所有冲突：
python scripts/detect_conflicts.py
脚本会输出：
- 冲突文件列表
- 每个文件的冲突数量
- 冲突区域位置
- 文件统计信息
分析冲突
使用 scripts/analyze_conflict.py 分析单个冲突文件的详细信息：
python scripts/analyze_conflict.py <file_path>
分析包括：
- 冲突类型识别
- 解决策略建议
- Git提交历史
- 冲突上下文
解决策略
根据冲突情况选择策略：
交互式解决（推荐）
使用 scripts/resolve_conflict_interactive.py 进行交互式解决，每次修改前都会：
- 显示变更预览（diff）
- 征询开发者同意
- 只有确认后才应用更改
python scripts/resolve_conflict_interactive.py <file> <strategy>
策略选项：
ours- 保留当前分支的更改theirs- 保留目标分支的更改merge- 智能合并双方更改
批量交互式解决
使用 scripts/batch_resolve_interactive.py 批量处理多个冲突文件：
python scripts/batch_resolve_interactive.py
脚本会：
- 检测所有冲突文件
- 逐个显示冲突详情和建议策略
- 让开发者选择解决策略
- 显示变更预览并征询同意
- 只有确认后才应用更改
非交互式解决（不推荐）
使用 scripts/resolve_conflict.py 直接解决（不推荐，不会征询同意）：
python scripts/resolve_conflict.py <file> <strategy>
Manual (手动解决)
复杂的业务逻辑冲突需要手动审查和合并。
- 打开冲突文件
- 审查两边的代码
- 手动合并或重写
- 删除冲突标记
- 使用
git add <file>标记为已解决
批量处理
对于多个冲突文件，使用交互式批量处理脚本：
python scripts/batch_resolve_interactive.py
流程：
- 自动检测所有冲突文件
- 逐个显示冲突详情和建议策略
- 每次修改前显示变更预览并征询同意
- 只有确认后才应用更改
- 逐个验证处理结果
重要: 批量处理也是交互式的，每个文件都会单独确认。
常见场景
场景1: 合并功能分支到主分支
- 检测冲突:
python scripts/detect_conflicts.py - 分析主要冲突文件
- 通常保留功能分支的更改（ours策略）
- 复杂冲突手动处理
What ships with it
7 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.
- references/best-practices.md 3.2 KB
- references/conflict-patterns.md 2.5 KB
- scripts/analyze_conflict.py 4.4 KB runs code
- scripts/batch_resolve_interactive.py 3.7 KB runs code
- scripts/detect_conflicts.py 4.3 KB runs code
- scripts/resolve_conflict_interactive.py 5.4 KB runs code
- scripts/resolve_conflict.py 4.0 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.
- 1mo ago First seen · 181 lines · 107 tokens per session scan A 1c8d7d1f419f
git-conflict-resolver is a skill published in the GitHub repository asasugar/SuperSpec (18 stars, last pushed 7mo ago), licensed MIT. It adds 107 tokens to every session and 1,533 once invoked, about $0.0004 per session on Opus 5.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
comet-github-issue-fix
A workflow for fixing a confirmed Comet-related GitHub issue or review blocker within an isolated scope. It covers matching the work to the relevant workflow, testing the change, checking runtime results, and preparing a careful handoff.
agent-merge-conflict-arbiter
Neutral arbiter for merge conflicts between two agents.
git-advanced-workflows
Master advanced Git workflows including rebasing, cherry-picking, bisect, worktrees, and reflog to maintain clean history and recover from any situation. Use when managing complex Git histories, collaborating on feature branches, or troubleshooting repository issues.
enable-check-includes-strict
Enable and migrate Chromium targets and directories to checkincludesstrict = true, diagnosing and resolving header include violations as part of the checkincludesstrict LSC. Use when adding directories to the allowlist, enabling strict header checks on targets, or resolving CHECKINCLUDESSTRICTUNTRIAGED targets.
resolve-handoff
Emit the complete Resolve handoff with exact modes, outcomes, test evidence, and publication state.
comet-hotfix
Comet preset path: Bug fix / hotfix. Skip brainstorming, directly open → build → verify → archive. Applicable for behavior fixes, scenarios not involving new capability design.