Skip to main content
Glama

gluecron_commit_pr_conflict_resolution

Commit the saved resolutions for a PR's conflicts ON THE PR HEAD as a two-parent merge commit (old head, base tip) — never on the base branch — moved through the push gates so CI runs on it before anything merges. Every unresolved file needs a draft (gluecron_resolve_pr_conflict) or an entry in resolutions; files the merge rules settle are settled automatically. Both shas are compare-and-swapped: a branch that moved since is refused with nothing changed. The commit carries Conflict-Resolution: trailers; a gluecron[bot] comment records it. Requires write access and 'repo' scope.

Input Schema

NameRequiredDescriptionDefault
repoYesRepo name
ownerYesRepo owner — username or organisation slug
numberYesPR number
messageNoOptional subject line (default: Merge branch '<base>' into <head>)
base_shaYesbaseSha from gluecron_list_pr_conflicts
head_shaYesheadSha from gluecron_list_pr_conflicts
resolutionsNoOptional explicit list instead of the saved drafts: [{path, how: manual | choice | ai | ai-edited | keep-mine | keep-main, content?}] — content is required unless how is keep-mine / keep-main

Schema Changelog

Changes observed during successful MCP inspections.

  1. Added

TDQS

A4.6/5.0
Behavior5/5

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

Goes well past the annotations: the commit runs through the push gates so CI executes before anything merges, both shas are compare-and-swapped so a moved branch is refused with nothing changed, and the call emits `Conflict-Resolution:` trailers plus a gluecron[bot] comment. It also discloses the auth requirement (write access and 'repo' scope), which annotations do not cover.

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?

Front-loads the action and the critical scope constraint ('never on the base branch') in the first sentence, and every later clause carries distinct information (gates, CAS, side effects, auth). It is dense and long-ish, but no sentence is filler.

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?

For a complex mutation with no output schema, the description supplies everything an agent needs: where the commit lands, what prerequisite resolution state is required, the concurrency-failure mode, the side effects, and the permissions needed. Nothing material is implied only by the schema.

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

Parameters4/5

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

Schema coverage is 100%, so the baseline is 3, but the description adds real meaning: `base_sha`/`head_sha` are compare-and-swap guards, not just IDs, and `resolutions` is an alternative supply path to saved drafts with merge-rule fallback for settled files. The enum values and content requirement are left to the schema.

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?

States a specific verb (commit) and resource (saved PR conflict resolutions) plus precise scope: it lands on the PR HEAD as a two-parent merge commit and never on the base branch. That scope line alone separates it from gluecron_merge_pr and gluecron_resolve_pr_conflict.

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?

Gives a clear precondition for calling it – every unresolved file needs a draft from gluecron_resolve_pr_conflict or an entry in `resolutions` – and names that sibling explicitly. It stops short of stating when *not* to use it (e.g. against a non-conflicted PR or before drafts exist), so it isn't a full when/when-not pairing.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.

Try in Browser

Glama MCP Gateway

Add one secure layer between your agents and this server.

Resources