Skip to main content
Glama

WritersLogic developer agents

lockfile-merge

Resolve git conflict markers in package-lock.json or a YAML lockfile — Takes a lockfile (package-lock.json or a YAML lockfile such as pnpm-lock.yaml) containing git merge-conflict markers, rebuilds both sides, and merges them key by key (using the diff3 base when present), returning the resolved file or the exact conflicting key paths with both values, for agents rebasing or merging branches. An optional prefer=ours|theirs applies one explicit policy to the remaining

Tool call template

Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.

{
  "id": 1,
  "jsonrpc": "2.0",
  "method": "tools/call",
  "params": {
    "arguments": {
      "content": "<content>"
    },
    "name": "lockfile-merge"
  }
}

Input Schema

NameRequiredDescriptionDefault
formatNoDefault auto: JSON when the file starts with { or [.
preferNoPolicy for keys changed on both sides. Default none: report them.
contentYesWhole file text; YAML at most 100000 characters.

Schema Changelog

Changes observed during successful MCP inspections.

  1. First observed

TDQS

Score is being calculated.

Try in Browser

Glama MCP Gateway

Add one secure layer between your agents and this server.

Resources