specsfy-specialist-merge-conflict-resolution

specsfy-specialist-merge-conflict-resolution is a skill for Codex from promovaweb/specsfy. It costs 60 tokens per session (361 once invoked), scanned A, original, no licence file.

A Git conflict-resolution guide for combining two sets of changes while preserving what each side intended. Git conflicts happen when a merge or rebase cannot safely choose between competing edits.

In plain words
What is it for?
Use it when Git reports unmerged files during a merge or rebase. It helps determine which edits belong together and validate the combined result.
Why use it?
It helps resolve conflicts without blindly choosing one version or accidentally changing application behavior. The result is checked as an integrated change.

Skill for Codex

Written for Codex: agents/openai.yaml present. Also seen: installed under .agents/ (shared by several agents).

Good fit Use it when Git reports unmerged files during a merge or rebase. It helps determine which edits belong together and validate the combined result.

Compare 6 skills from other repositories ↓
Install with agentmods
npx agentmods add skills/promovaweb/specsfy/specsfy-specialist-merge-conflict-resolution
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Any agent
npx skills add promovaweb/specsfy --skill specsfy-specialist-merge-conflict-resolution
Clone the repo
git clone --depth 1 https://github.com/promovaweb/specsfy

Made for: Codex.

Wrote 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.

agentmods badge for specsfy-specialist-merge-conflict-resolution

README.md
[![agentmods](https://agentmods.dev/badge/skills/promovaweb/specsfy/specsfy-specialist-merge-conflict-resolution/github.svg)](https://agentmods.dev/skills/promovaweb/specsfy/specsfy-specialist-merge-conflict-resolution)
Your own site
<a href="https://agentmods.dev/skills/promovaweb/specsfy/specsfy-specialist-merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/promovaweb/specsfy/specsfy-specialist-merge-conflict-resolution/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.

agentmods 80×15 button for specsfy-specialist-merge-conflict-resolution

Your own site · 80×15
<a href="https://agentmods.dev/skills/promovaweb/specsfy/specsfy-specialist-merge-conflict-resolution"><img src="https://agentmods.dev/badge/skills/promovaweb/specsfy/specsfy-specialist-merge-conflict-resolution.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 60 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 361 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin unknown No closer match found in the catalogue.
Token cost

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.

ModelPer sessionOnce invoked
Fable 5.1 $0.00060 $0.00361
Opus 5 $0.00030 $0.00180
Sonnet 5 $0.00012 $0.00072
Haiku 4.5 $0.00006 $0.00036

Measured 12d ago against content hash 424dfd0fe055, method: parsed. Prices are Anthropic first-party input rates as of 2026-09-12, from the pricing page.

Security

Grade A, and why

specsfy-specialist-merge-conflict-resolution 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 12d 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.

example/.agents/skills/specsfy-specialist-merge-conflict-resolution/SKILL.md · 37 lines

The source is not reproduced here

No licence file

A repository with no LICENSE is all rights reserved by default, so the body is not copied here. The metadata, the measurements and the link are.

Read it on GitHub

Files

What ships with it

2 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.

Changes

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.

  1. 12d ago First seen · 37 lines · 60 tokens per session scan A 424dfd0fe055

Subscribe to this mod's changes

specsfy-specialist-merge-conflict-resolution is a skill published in the GitHub repository promovaweb/specsfy (79 stars, last pushed 3d ago), with no licence file. It adds 60 tokens to every session and 361 once invoked, about $0.0003 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.

Related

Other skills, from other repositories

agent-framework-py-release

Use when cutting a Python release for the microsoft/agent-framework monorepo. Triggers on "bump py versions", "cut a python release", "prepare release PR for python", "release py packages", "bump python to X.Y.Z", or similar requests to bump Python package versions and prepare a release PR. Handles all four lifecycle…

microsoft/agent-framework · 103 tokens

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.

wshobson/agents · 54 tokens

workflow-patterns

Use this skill when implementing tasks according to Conductor's TDD workflow, handling phase checkpoints, managing git commits for tasks, or understanding the verification protocol.

wshobson/agents · 35 tokens

python-release

Handle Python SDK release, build, bump, packaging metadata, PyPI client pin, uv.lock, nox/build workflow, and publish verification changes. Use for Python release process work or dependency pin bumps; do not use for ordinary Python feature implementation.

ComposioHQ/composio · 53 tokens

fanout

Run independent subtasks in parallel — one git worktree and one implementation sub-agent per task, each opening its own PR — then cross-review every PR. polly never merges; the human does.

omnigent-ai/omnigent · 43 tokens

fork-fleet

Fork divergence monitor - tracks where the fleet's active forks diverge in CODE (unique commits, new/modified skills) and CONFIG (enable/var/model/schedule vs upstream), gated on real change.

aeonfun/aeon · 45 tokens