resolve_conflict

MCP tool from MegaMemory by 0xK3vin

Resolve a merge conflict by providing verified, correct content based on the current codebase.

How to use it

Project documentation lists resolve_conflict for the MegaMemory 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.

Install MegaMemory

$npm install -g megamemory

FULL MEGAMEMORY LISTING

Other tools in MegaMemory (8)

create_concept

Add a new concept with optional edges and file references.

get_concept

Look up a concept by its exact ID. Returns full context including children, edges, incoming edges, and parent.

link

Create a typed relationship between two concepts.

list_conflicts

List unresolved merge conflicts grouped by merge group.

list_roots

List all top-level concepts with direct children.

remove_concept

Soft-delete a concept with a reason. History preserved.

understand

Semantic search over the knowledge graph. Returns matched concepts with children, edges, and parent context.

update_concept

Update fields on an existing concept. Regenerates embeddings automatically.