Skip to main content
Glama

rebase_conflicts

See each rebase conflict as two diffs from the base to understand both intents and combine them, avoiding marker noise.

Instructions

Report each conflict as what the two sides did, rather than as markers.

Per contested region you get two diffs from the common base: one for the branch built so far, one for the commit being replayed. Read them as two intents and compose them -- "wrap this block in an if" plus "swap this call" is usually just both.

Regions only one side changed are not listed: git merged those already.

context is how many unchanged lines to show around each change. Raise it when the region is hard to place -- which function it is in, whether the lines above already do what the replayed commit is adding. Set include_full_sides for the three whole texts when even that is not enough.

Input Schema

TableJSON Schema
NameRequiredDescriptionDefault
repoNo.
contextNo
include_full_sidesNo

Output Schema

TableJSON Schema
NameRequiredDescriptionDefault
filesYes
guidanceYes
replayingYes
replaying_bodyYes
Behavior5/5

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

With no annotations provided, the description carries the full burden. It discloses precise behavioral details: per-region two diffs from common base, omission of regions where only one side changed, and parameter effects. This goes well beyond the tool name and provides a clear mental model of the output.

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 paragraph that front-loads the purpose, then covers output structure, exclusions, and parameter tuning. Every sentence contributes meaningful information without repetition or fluff.

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

Completeness5/5

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

The description is complete for a diagnostic tool: it explains what it does, how to interpret results, what is intentionally omitted, and how to vary parameters. The output schema likely covers exact return structure, and the only minor omission of `repo` is acceptable given its default and self-explanatory type.

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, so the description must compensate. It fully explains both `context` ('how many unchanged lines to show around each change') and `include_full_sides` ('for the three whole texts'), including when to increase them, effectively replacing missing schema documentation.

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 a specific verb and resource: 'Report each conflict as what the two sides did, rather than as markers.' It distinguishes itself from generic conflict listing by explaining the two-diff structure and what is intentionally omitted, making it stand out among sibling tools.

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 gives clear context on how to use the tool, including when to adjust `context` and `include_full_sides`. However, it does not explicitly name alternatives or state when to prefer this over `rebase_status` or `rebase_resolve`, so usage is implied rather than explicitly contrasted with siblings.

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/aaron-riact/git-rebase-mcp'

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