What is resolving-merge-conflicts?

A workflow for resolving conflicts during an active Git merge or rebase. It examines the conflicting changes and their original intent, then runs checks and completes the operation.

Use it when a merge or rebase has conflicts, including reviewing history, resolving files, running tests and type checks, and finishing the Git operation.

It helps preserve the purpose of both sets of changes instead of resolving conflict markers mechanically. It also checks that the result still works.

How 51ck/frontier-mcp configures Codex

Reuse

Borrowing it

Nothing to install: this file belongs to 51ck/frontier-mcp. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file

curl -O https://raw.githubusercontent.com/51ck/frontier-mcp/master/.agents/skills/resolving-merge-conflicts/SKILL.md

Clone the repo

git clone --depth 1 https://github.com/51ck/frontier-mcp

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.

README.md

[![agentmods](https://agentmods.dev/badge/skills/51ck/frontier-mcp/resolving-merge-conflicts/github.svg)](https://agentmods.dev/skills/51ck/frontier-mcp/resolving-merge-conflicts)

Your own site

<a href="https://agentmods.dev/skills/51ck/frontier-mcp/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/51ck/frontier-mcp/resolving-merge-conflicts/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.

Your own site · 80×15

<a href="https://agentmods.dev/skills/51ck/frontier-mcp/resolving-merge-conflicts"><img src="https://agentmods.dev/badge/skills/51ck/frontier-mcp/resolving-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 23 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 204 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 84% copy Near-identical to another mod 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.

Model	Per session	Once invoked
Fable 5.1	$0.00023	$0.00204
Opus 5.5	$0.00009	$0.00082
Sonnet 5.5	$0.00005	$0.00041
Haiku 4.5	$0.00002	$0.00020

Measured 1mo ago against content hash 9d8114f8ef0b, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

resolving-merge-conflicts 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.

Origin

This is a copy

84% identical to resolve-merge-conflict — 12 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.

.agents/skills/resolving-merge-conflicts/SKILL.md · 15 lines

What it actually says

See the current state of the merge/rebase. Check git history, and the conflicting files.
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.
Discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the merge broke.
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

Files

What ships with it

1 file 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.

agents/openai.yaml 113 B

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.

1mo ago First seen · 15 lines · 23 tokens per session scan A 9d8114f8ef0b

Subscribe to this mod's changes

resolving-merge-conflicts is a skill published in the GitHub repository 51ck/frontier-mcp (0 stars, last pushed 1mo ago), licensed MIT. It adds 23 tokens to every session and 204 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. It is 84% identical to resolve-merge-conflict, differing in 12 lines, and is treated as a copy.

Git and workflow

resolving-merge-conflicts next to 6 skills from other repositories
Mod	Type	Stars	Last push	Licence	Scan	Tokens	Works with
resolving-merge-conflicts51ck/frontier-mcp	Skill	0	1mo ago	MIT	A	23	Codex
merge-batchdiegosouzapw/OmniRoute	Skill	83k	6d ago	MIT	A	46	Claude Code
prowler-commitprowler-cloud/prowler	Skill	15k	yesterday	Apache-2.0	A	44	Claude Code, Codex
gh-auth-isolationgithub/gh-aw	Skill	5.6k	yesterday	MIT	A	20	Claude Code, Codex
github-skillzeenie-ai/OpenCompany	Skill	1.1k	yesterday	MIT	A	51	Claude Code
comet-githubrpamis/comet	Skill	3.3k	yesterday	MIT	A	72	Claude Code, Codex
release-helperSahir619/fable-method	Skill	2.3k	1mo ago	MIT	A	43	Claude Code

frontier-mcp: Skill for Codex