Skip to main content
Glama
penta2himajin

noveletary

merge_branches

Merge branches with automatic conflict detection: auto-merge when only one side changed, create conflict question when both sides modify same fact differently for author resolution.

Instructions

[branch] src ブランチを dst へ統合(3-way)。片側のみ変更した事実は自動統合。 両側が同一事実を別の値にした箇所は競合として作者質問(MERGE_CONFLICT)を生成する。 競合は answer_question で正史を決める。

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
dstYes
srcYes
Behavior4/5

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

Description reveals auto-merge behavior and conflict generation (MERGE_CONFLICT). Annotations only set readOnlyHint=false, so description adds valuable behavioral 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, each providing essential information: purpose, behavior, and conflict handling. No redundant text.

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?

Covers input and process well, but does not describe output format or return values. With no output schema, this is a minor gap.

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

Parameters5/5

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

Schema has 0% description coverage and only parameter names. Description explicitly defines 'src' as source branch and 'dst' as destination branch, adding complete meaning.

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?

Description clearly states the tool merges a source branch into a destination branch using 3-way merge. It distinguishes from sibling tools like create_branch and delete_branch by specifying integration of branches.

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?

Describes when automatic merge occurs (only one side changed) and when conflict arises (both sides change same fact to different values). Advises using answer_question for conflict resolution, providing usage context.

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/penta2himajin/noveletary'

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