Skip to main content
Glama

atlas_smart_merge

Resolve Git merge conflicts with AI by understanding code intent from both branches. Detect semantic conflicts beyond text, generate tests, and score confidence for auto-application.

Instructions

AI-POWERED MERGE CONFLICT RESOLUTION

Automatically resolve merge conflicts using AI:

  • Automatically resolve merge conflicts using AI

  • Understand code intent from both branches

  • Detect semantic conflicts (not just textual)

  • Preserve functionality from both sides when possible

  • Generate test cases for merged code

  • Confidence scoring for auto-resolutions

  • Interactive suggestions for manual review

  • Integration with git workflow

Never waste hours on merge conflicts again - let AI handle them.

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
autoResolveNoAutomatically apply resolutions (default: false)
projectPathYesPath to the git repository root
generateTestsNoGenerate test suggestions for resolved conflicts
conflictedFilesNoSpecific conflicted files (auto-detected if not provided)
confidenceThresholdNoMinimum confidence for auto-resolution (0-1, default: 0.7)
preserveBothWhenUnsureNoKeep both versions when uncertain
Behavior3/5

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

With no annotations provided, the description carries the transparency burden. It discloses that it's AI-powered, can detect semantic conflicts, preserve both sides, generate tests, and provide confidence scoring. However, it does not explicitly state whether it modifies files, whether autoResolve causes irreversible changes, or require a clean working tree. The marketing tagline ('Never waste hours') adds no operational transparency. Could be more explicit about safety/state changes.

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?

The description is structured as a feature list with a clear title and bullet points. It is reasonably concise and front-loaded. However, the final marketing sentence ('Never waste hours...') is unnecessary and dilutes usefulness. The core bullet list is informative without being bloated, earning a 4.

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?

For a complex tool with 6 parameters and no output schema or annotations, the description covers key features but misses operational details: return values, error conditions, prerequisite git state, and whether auto-resolutions are applied to the working tree. It explains what the tool does but not fully how results are returned or what side effects occur. The schema covers parameters, but the description is not fully complete for safe invocation.

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 description coverage is 100%, so the baseline is 3. The description mentions features like 'Generate test cases' and 'Confidence scoring', which loosely map to generateTests and confidenceThreshold, but it doesn't add parameter-level semantics beyond the schema. The schema already documents each parameter clearly, so the description adds little extra value.

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's purpose: 'Automatically resolve merge conflicts using AI.' It uses a specific verb ('resolve') and resource ('merge conflicts'), and distinguishes itself from sibling tools like atlas_git by focusing on AI-powered conflict resolution, semantic understanding, and test generation. The title also reinforces this.

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 indicates the tool is for merge conflicts and mentions 'Integration with git workflow,' giving clear context for when to use it. It doesn't explicitly state when not to use it or name alternatives, but the focused scope ('merge conflicts') and features like 'autoResolve' and 'interactive suggestions' imply appropriate usage. Lacks explicit exclusions but is fairly clear.

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/IamNishant51/atlas-mcp-server'

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