agentmods.dev

resolve-conflicts

resolve-conflicts is a command for Claude Code from ai-sdlc-framework/ai-sdlc. It costs 79 tokens per session (2,083 once invoked), scanned A, original, Apache-2.0.

A command that manually starts a conflict-resolution process for one pull request. A pull request conflict happens when its changes no longer apply cleanly to the latest version of the main code line.

In plain words
What is it for?
Use it to rebase a conflicting pull request and restore its automated checks or merge request when appropriate.
Why use it?
It lets an operator resolve a stale pull request immediately instead of waiting for an automated watcher to notice it.

Command for Claude Code

Written for Claude Code: allowed-tools in frontmatter. Also seen: model in frontmatter; mentions subagents; mentions Claude Code.

Part of the ai-sdlc plugin — 3 skills, 25 commands, 14 agents shipped together

not rated 434repo +7 changed 20d ago A scan 79 tokens original Apache-2.0

Good fit Use it to rebase a conflicting pull request and restore its automated checks or merge request when appropriate.

Compare 6 commands from other repositories ↓
Install with agentmods
npx agentmods add commands/ai-sdlc-framework/ai-sdlc/resolve-conflicts
View source ↗ ai-sdlc-framework/ai-sdlc ai-sdlc.io
Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

Clone the repo
git clone --depth 1 https://github.com/ai-sdlc-framework/ai-sdlc

Made for: Claude Code.

Or install ai-sdlc, the plugin that ships this one along with the rest of its 3 skills, 25 commands, 14 agents.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for resolve-conflicts

README.md
[![agentmods](https://agentmods.dev/badge/commands/ai-sdlc-framework/ai-sdlc/resolve-conflicts/github.svg)](https://agentmods.dev/commands/ai-sdlc-framework/ai-sdlc/resolve-conflicts)
Your own site
<a href="https://agentmods.dev/commands/ai-sdlc-framework/ai-sdlc/resolve-conflicts"><img src="https://agentmods.dev/badge/commands/ai-sdlc-framework/ai-sdlc/resolve-conflicts/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for resolve-conflicts

Your own site · 80×15
<a href="https://agentmods.dev/commands/ai-sdlc-framework/ai-sdlc/resolve-conflicts"><img src="https://agentmods.dev/badge/commands/ai-sdlc-framework/ai-sdlc/resolve-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 79 Only the description is in the session, so the agent can decide to use it. The body loads when it is invoked.
When invoked 2,083 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00079 $0.02083
Opus 5.5 $0.00032 $0.00833
Sonnet 5.5 $0.00016 $0.00417
Haiku 4.5 $0.00008 $0.00208

Measured 20d ago against content hash 19dbb4e2a73a, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

resolve-conflicts scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 20d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

ai-sdlc-plugin/commands/resolve-conflicts.md · 187 lines

How it starts

The opening of the file, as written. The whole thing — 187 lines — stays where its author put it; the contents beside it link to each section on GitHub.

Manually invoke the ci-conflict-resolver subagent for PR #$ARGUMENTS. This is the AISDLC-460 manual escape hatch — the dispatch state machine will pick it up on a later tick anyway, but the operator sometimes wants to drive the rebase + re-arm immediately (e.g. an auto-merge-armed PR is stuck and you want it cleared before walking away).

Why this lives in a slash command (not the agent directly)

Plugin subagents cannot use the Agent tool (the harness filters it out one level deep — empirical proof in AISDLC-69.2 / AISDLC-98). The slash command body runs in the main Claude Code session which DOES have Agent, so it can spawn ci-conflict-resolver directly. This is the same architecture pattern as /ai-sdlc rebase and /ai-sdlc execute.

Hard rules (NEVER violate)

  1. Merging follows governance.allowMerge in .ai-sdlc/agent-role.yaml, rendered into the session hard rules; when it permits merging, the only path is cli-merge-if-eligible; never run the raw merge command. Do not run gh pr merge in any form (the hook denies it, --auto included). The re-arm path the agent owns is node pipeline-cli/bin/cli-merge-if-eligible.mjs <pr> --source-kind backlog --arm, which applies the repo's merge policy and trust checks before re-attaching the auto-merge request that the force-push cleared (AISDLC-356).
  2. Never force-push with plain --force / -f. Always use --force-with-lease. The agent enforces this; this command does not push directly.
  3. Never push to main or master. The agent refuses; this command also refuses at Step 1.
  4. Never close PRs or issues.
  5. Never delete branches.
  6. Edit governance config (.ai-sdlc/**) only when the task names the file and the change; never as a side effect. Runtime artifacts (attestations, reviews, transcript leaves, the decision log, the dispatch board) are written through their CLIs as today. Runs marked untrusted (AI_SDLC_UNTRUSTED_RUN) are blocked from .ai-sdlc/** and .github/workflows/** by the hook; ask a maintainer in the PR instead of retrying. .github/workflows/** is only refused when the project's .ai-sdlc/agent-role.yaml lists it under blockedPaths — not blocked by default.
  7. Never write GitHub Actions CI-skip magic tokens. (AISDLC-88.)

Read the full file on GitHub · 187 lines

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 20d ago Changed · +1 lines 19dbb4e2a73a
  2. 21d ago Changed · -23 lines · -6 tokens per session c8d6007d02c1
  3. 28d ago Changed a43dab922e6e
  4. 1mo ago Changed 622c51fe355c
  5. 1mo ago Changed b1ec3712d7da
  6. 1mo ago Changed · +1 lines 4424c145e4a1
  7. 2mo ago Changed e5606dfbfed3
  8. 2mo ago First seen · 208 lines · 85 tokens per session scan A 94d9fd65135b

Subscribe to this mod's changes

resolve-conflicts is a command published in the GitHub repository ai-sdlc-framework/ai-sdlc (434 stars, last pushed yesterday), licensed Apache-2.0. It adds 79 tokens to every session and 2,083 once invoked, about $0.0003 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

DebuggingDevOps and cloudGit and workflowGoai-agentsai-coding-agentsai-governancedeveloper-tools
Related

resolve-conflicts compared with commands from other repositories

resolve-conflicts next to 6 commands from other repositories
ModTypeStarsLast pushLicenceScanTokensWorks with
resolve-conflictsai-sdlc-framework/ai-sdlcCommand434yesterdayApache-2.0A79Claude Code
discoverairblackbox/airblackboxCommand254d agoApache-2.0A12Claude Code
hotfixlugassawan/swe-workbenchCommand33d agoMITA32Claude Code
service-checkAbilityai/trinityCommand741yesterdayApache-2.0A0Claude Code
AGENTSmax-sixty/worktrunkCommand12kyesterdaynoneA0Claude Code
fix-issuefltman/project-scaffolderCommand889d agoMITA0Claude Code
explain-errorGoldziher/ai-rulezCommand167yesterdayMITA15Claude Code