ForgeMCP

by hardened-steel

Overview Schema Source Related Servers Discussions Admin

Python

Local

git_merge

Destructive

Merge a specified commit while preserving conflicts for explicit resolution and continuation.

Instructions

Merge one commit, preserving conflicts for explicit resolution and continuation.

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": {
      "revision": "<revision>"
    },
    "name": "git_merge"
  }
}

Input Schema

Name	Required	Description	Default
`message`	No
`revision`	Yes

Output Schema

Name	Required	Description	Default
`error`	No
`changes`	Yes
`updates`	No
`conflicts`	Yes
`operation`	Yes
`head_after`	Yes
`head_before`	Yes
`process_ids`	Yes
`synchronization_error`	No

Schema Changelog

Changes observed during successful MCP inspections.

Addedv0.5.1Nov 5, 2026

TDQS

B3.2/5.0

Behavior3/5

Does the description disclose side effects, auth requirements, rate limits, or destructive behavior?

Annotations already declare destructiveHint=true, readOnlyHint=false, and openWorldHint=false, so the safety profile is covered. The description adds useful context that conflicts are not auto-resolved and that a continuation step is needed, but it omits whether a commit is created on success or how the working tree/index is affected.

Agents need to know what a tool does to the world before calling it. Descriptions should go beyond structured annotations to explain consequences.

Conciseness4/5

Is the description appropriately sized, front-loaded, and free of redundancy?

A single front-loaded sentence with no filler, and the conflict-preservation behavior is stated up front. It is efficient, though the terseness leaves gaps that a slightly longer description could have closed.

Shorter descriptions cost fewer tokens and are easier for agents to parse. Every sentence should earn its place.

Completeness3/5

Given the tool's complexity, does the description cover enough for an agent to succeed on first attempt?

An output schema exists and annotations cover the mutation/destructive nature, lowering the disclosure burden. However, for a two-parameter mutation tool with zero schema coverage, the description leaves both parameter meaning and post-merge state (auto-commit, fast-forward behavior) unexplained.

Complex tools with many parameters or behaviors need more documentation. Simple tools need less. This dimension scales expectations accordingly.

Parameters2/5

Does the description clarify parameter syntax, constraints, interactions, or defaults beyond what the schema provides?

Schema description coverage is 0% for both parameters, so the description must compensate and does not. It never explains what form 'revision' takes (SHA, branch, tag) or what 'message' does versus a default-generated merge message.

Input schemas describe structure but not intent. Descriptions should explain non-obvious parameter relationships and valid value ranges.

Purpose4/5

Does the description clearly state what the tool does and how it differs from similar tools?

The description names a specific verb ('Merge') and resource ('one commit'), and adds a distinguishing behavioral note about conflicts being preserved. It does not explicitly name the sibling alternatives (git_rebase, git_cherry_pick, git_pull), so sibling differentiation is only partial.

Agents choose between tools based on descriptions. A clear purpose with a specific verb and resource helps agents select the right tool.

Usage Guidelines3/5

Does the description explain when to use this tool, when not to, or what alternatives exist?

Usage is only implied: 'preserving conflicts for explicit resolution and continuation' sketches the merge-resolve-continue workflow, hinting at git_continue and git_conflicts. There is no explicit statement of when to pick this over git_rebase, git_cherry_pick, or git_pull.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.

Deploy Server