Skip to main content
Glama
jungchihoon

GitHub MCP Server

by jungchihoon

git-merge

Merge a branch into the current branch and detect conflicts to maintain version control integrity.

Instructions

Merge a branch into the current branch with conflict detection

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
directoryNoThe directory to run the command in (defaults to current working directory)
branchYesThe branch to merge into the current branch
strategyNoMerge strategy (optional): ours, theirs, recursive, etc.
Behavior2/5

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

Description mentions conflict detection but fails to disclose implications like merge commit creation, abort behavior on conflict, or that merge is non-destructive. With no annotations, more behavioral detail needed.

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?

Single sentence, front-loaded, no redundancy. Could expand slightly without becoming verbose.

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

Completeness2/5

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

Given sibling tools like git-rebase and no output schema, description should clarify when merge is preferred and what conflict detection entails. Lacks enough context for safe usage.

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 covers 100% of parameters with descriptions. Description adds minimal value beyond 'strategy' enum list; baseline 3 is appropriate.

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 branch into the current branch with conflict detection, distinguishing it from siblings like git-rebase or git-cherry-pick.

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

Usage Guidelines2/5

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

No guidance on when to use merge versus alternatives (e.g., rebase, cherry-pick) or when not to use it. Lacks context for decision-making.

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/jungchihoon/github-mcp-server'

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