resolve_conflict

MCP tool from Foremerge by naw103

Record an audited resolution for a durable conflict

How to use it

Project documentation lists resolve_conflict for the Foremerge MCP server. Add the server to your MCP client (Claude Desktop, Cursor, Windsurf and others), then check which tools your installed version makes available. Tool availability can depend on configuration and credentials. A server handshake does not verify this tool’s behavior. See the full listing for setup details.

FULL FOREMERGE LISTING

Other tools in Foremerge (17)

accept_changeset

Apply final conflict, dependency, validation, and Git gates

check_conflicts

Check a published or provisional intent before code changes

claim_work

Create leased advisory claims on semantic scopes

coordinate_with_agent

Send a durable message linked to a conflict or ChangeSet

discard_work

Preserve abandoned work while releasing claims and blockers

get_changeset

Read one ChangeSet and Git/provenance state

get_intent

Read one intent and current conflict snapshot

list_agents

Read registered agent provenance

publish_changeset

Record implementation, tests, decisions, and Git provenance

publish_intent

Announce planned work, declare what it does to each scope, and receive conflicts plus related work to assess

query_work

Find agents, intents, claims, ChangeSets, and conflicts

record_assessment

Record what you concluded about one related intent and what you will do

record_commit

Record the actual Git integration commit

register_agent

Record agent, model, capabilities, and worktree provenance

run_verification

Run a trusted repository check by name, never raw MCP argv

start_work

Advance claimed work into implementation

status

Read one consistent coordinator status snapshot