Skip to main content
Glama

veto_merge_conflict

Resolve git merge conflicts by analyzing conflict markers and understanding the intent of both branches to produce a semantically correct result.

Instructions

Analyzes a file with git conflict markers and returns a semantically correct resolution by understanding the intent of both branches.

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
file_pathYesPath to the file containing conflict markers.
project_dirNoOptional project directory for context.
Behavior3/5

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

Annotations (readOnlyHint=false, destructiveHint=false) indicate it may not be purely read-only, but the description doesn't clarify whether the tool modifies the file or just returns a resolution. It adds the notion of 'understanding intent' but lacks behavioral clarity on side effects.

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?

The description is a single, well-structured sentence that conveys the essential purpose and behavior without any extraneous detail. It is front-loaded and efficient.

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?

For a tool with no output schema, the description provides a general idea of the return value (a resolution) but doesn't specify format or details. Given the complexity of merge conflict resolution, a bit more detail would be helpful, but it is still sufficient for an AI agent to understand the tool's purpose.

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?

The input schema covers both parameters with clear descriptions, achieving 100% coverage. The description adds no additional meaning beyond the schema, so the baseline score of 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?

The description clearly states the tool analyzes a file with git conflict markers and returns a semantically correct resolution. It distinguishes itself from siblings like veto_diff_review by focusing on conflict resolution through understanding both branches' intent.

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 description effectively tells when to use the tool—when a file contains git conflict markers. However, it does not explicitly state when not to use it or mention alternative tools, though the context is clear enough for an AI agent.

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/jigyasudham/veto'

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