Skip to main content
Glama
saitolume

git-mcp-server

by saitolume

git-mcp-server: Continue merge

git_merge_continue
Destructive

Continues a merge session after all conflicts are resolved and staged, finalizing the merge in the specified repository.

Instructions

Operation: Continue the exact owned merge_session_id after all conflicts are resolved. Returns: request_id, repository_id, and resulting head and commit object IDs. Defaults: all inputs are required, native hooks run, and signing stays disabled. Excludes: external merge sessions, unresolved conflicts, arbitrary commits or refs, and retry.

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
repositoryYesAbsolute path to the exact target Git worktree for this mutation.
request_idYesClient-generated UUID that makes this mutation durable and idempotent for exact replay.
expected_headYesExact current local HEAD object ID expected before mutation; mismatch rejects without Git mutation.
expected_branchYesExact current local branch name expected before mutation; mismatch rejects without Git mutation.
merge_session_idYesOwned conflicted merge-session ID to continue after all unresolved paths are staged.

Output Schema

TableJSON Schema
NameRequiredDescriptionDefault
dataNo
errorNo
statusYes
warningsYes
operationYes
request_idNo
repository_idNo
observed_afterNo
observed_beforeNo
Behavior4/5

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

Annotations indicate destructiveHint=true, readOnlyHint=false. The description adds details about defaults (all inputs required, native hooks run, signing disabled) and return values, providing context beyond annotations.

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

Conciseness5/5

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

Three sentences: action, returns, defaults, exclusions. No wasted words, front-loaded core purpose.

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

Completeness4/5

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

Given 5 required params, destructive nature, and presence of output schema, the description covers purpose, usage, behavior, and exclusions adequately. Could add more on safety guarantees but sufficient.

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

Parameters3/5

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

Schema coverage is 100% with descriptions. The description adds minimal extra meaning ('owned', 'after all unresolved paths are staged') but mostly reiterates schema info.

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

Purpose5/5

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

The description clearly states the verb 'Continue' and the resource 'owned merge_session_id' with the condition 'after all conflicts are resolved'. It distinguishes from siblings like git_merge and git_merge_abort.

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

Usage Guidelines4/5

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

The 'Excludes' line explicitly lists scenarios where the tool should not be used (external sessions, unresolved conflicts). It implies usage after conflict resolution, though alternatives are not named directly.

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

Install Server

Other Tools

Latest Blog Posts

MCP directory API

We provide all the information about MCP servers via our MCP API.

curl -X GET 'https://glama.ai/api/mcp/v1/servers/saitolume/git-mcp-server'

If you have feedback or need assistance with the MCP directory API, please join our Discord server