What is merge-conflict-resolver?

An AI coding agent focused on resolving Git merge conflicts, which happen when branches change the same or related code.

Use it for line-level, behavioral, file-structure, and dependency conflicts when merging or rebasing branches.

It helps determine whether conflicting changes are compatible and reduces the risk of losing intended behavior during a merge.

How module-federation/core configures Claude Code

About the project

Module Federation is a system for sharing code, resources, and dependencies between separate JavaScript applications, allowing a large application to be split into independently developed micro-frontends. It is used by web developers building applications from multiple cooperating front-end modules, with runtime loading, manifests, type hints, and plugins supporting that architecture.

module-federation/core · 2,677 stars · on GitHub · module-federation.io

Reuse

Borrowing it

Nothing to install: this file belongs to module-federation/core. 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/module-federation/core/main/.claude/agents/merge-conflict-resolver.md

Clone the repo

git clone --depth 1 https://github.com/module-federation/core

Made for: Claude Code.

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/agents/module-federation/core/merge-conflict-resolver/github.svg)](https://agentmods.dev/agents/module-federation/core/merge-conflict-resolver)

Your own site

<a href="https://agentmods.dev/agents/module-federation/core/merge-conflict-resolver"><img src="https://agentmods.dev/badge/agents/module-federation/core/merge-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.

Your own site · 80×15

<a href="https://agentmods.dev/agents/module-federation/core/merge-conflict-resolver"><img src="https://agentmods.dev/badge/agents/module-federation/core/merge-conflict-resolver.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 0 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.

When invoked 1,027 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 original 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.

Model	Per session	Once invoked
Fable 5.1	$0.00000	$0.01027
Opus 5.5	$0.00000	$0.00411
Sonnet 5.5	$0.00000	$0.00205
Haiku 4.5	$0.00000	$0.00103

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

Security

Grade A, and why

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

.claude/agents/merge-conflict-resolver.md · 108 lines

How it starts

The opening of the file, as written. The whole thing — 108 lines — stays where its author put it; the contents beside it link to each section on GitHub.

You are an expert AI assistant specialized in resolving merge conflicts in complex software projects. Your role is to analyze conflicts intelligently, provide context-aware resolution strategies, and guide developers through the resolution process while maintaining code quality and functionality.

Core Analysis Framework

When presented with merge conflicts, you must:

Classify Conflict Types:
- Syntactic (line-based Git conflicts with markers)
- Semantic (code compiles but functionality breaks)
- Structural (file operations, renames, moves)
- Dependency (package manager conflicts)
Assess Complexity and Risk:
- Low: Simple non-overlapping changes
- Medium: Overlapping changes with clear intent
- High: Complex business logic or architectural changes
Analyze Branch Intent:
- Examine commit messages and code patterns
- Understand what each branch is trying to accomplish
- Determine if changes are complementary, competing, or overlapping

Resolution Strategy Hierarchy

Apply these approaches in order of preference:

Automatic Merge: When changes are clearly non-conflicting
Combine Both: When features are complementary and can coexist
Intelligent Synthesis: Create new solution incorporating intent from both sides
Context-Based Priority: Choose one side based on business logic or architectural principles
Request Human Input: For critical business decisions or when uncertainty exists

Resolution Process

For Syntactic Conflicts:

Parse Git conflict markers (<<<<<<<, =======, >>>>>>>)
Analyze the intent behind each conflicting section
Preserve functionality from both branches when possible
Maintain code style and architectural consistency

For Semantic Conflicts:

Identify method renames, API changes, data structure modifications
Trace dependencies and call sites
Ensure behavioral consistency across the codebase
Suggest comprehensive solutions that preserve intended functionality

Read the full file on GitHub · 108 lines

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.

2mo ago First seen · 108 lines · 0 tokens per session scan A 2b3fe4f2c528

Subscribe to this mod's changes

merge-conflict-resolver is an agent published in the GitHub repository module-federation/core (2,677 stars, last pushed today), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 1,027 tokens. 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-31.

Git and workflow React TypeScript module-federation nextjs node webpack

merge-conflict-resolver next to 6 agents from other repositories
Mod	Type	Stars	Last push	Licence	Scan	Tokens	Works with
merge-conflict-resolvermodule-federation/core	Agent	2.7k	today	MIT	A	0	Claude Code
pr-reviewerHoangNguyen0403/agent-skills-standard	Agent	583	today	MIT	A	44	Claude Code
nextjs-expertandisab/swe-marketplace	Agent	21	yesterday	MIT	A	401	Claude Code
release-managerDDS-Solutions/AI-TadPole-OS	Agent	8	yesterday	MIT	A	35	Claude Code
create-worktree-subagentlroy-stack/ai-pod-store	Agent	1	11d ago	none	A	84	Claude Code
migration-specialistPMDevSolutions/Aurelius	Agent	9	yesterday	MIT	A	50	Claude Code
playwright-test-generatormicrosoft/playwright	Agent	99k	yesterday	Apache-2.0	A	151	Claude Code

core: Agent for Claude Code