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.
npx agentmods add commands/roocodeinc/roo-code/roo-resolve-conflictsgit clone --depth 1 https://github.com/RooCodeInc/Roo-CodeWhat 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.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5 | $0.00008 | $0.00445 |
| Opus 5 | $0.00004 | $0.00222 |
| Sonnet 5 | $0.00002 | $0.00089 |
| Haiku 4.5 | $0.00001 | $0.00044 |
Grade A, and why
roo-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 2d 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.
Copies of this mod
2 near-identical copies found in the catalogue:
- roo-resolve-conflicts — 100% identical, 10 lines differ
- roo-resolve-conflicts — 100% identical, 0 lines differ
What it actually says
Resolve merge conflicts for a specific pull request by analyzing git history, commit messages, and code changes to make intelligent resolution decisions.
Quick Start
-
Provide a PR number (e.g.,
#123or just123) -
The workflow will automatically:
- Fetch PR information (title, description, branches)
- Checkout the PR branch
- Rebase onto the target branch to reveal conflicts
- Analyze and resolve conflicts using git history
Workflow Steps
1. Initialize PR Resolution
# Fetch PR info
gh pr view [PR_NUMBER] --json title,body,headRefName,baseRefName
# Checkout and rebase
gh pr checkout [PR_NUMBER] --force
git fetch origin main
GIT_EDITOR=true git rebase origin/main
2. Identify Conflicts
git status --porcelain | grep "^UU"
3. Analyze Each Conflict
For each conflicted file:
- Read the conflict markers
- Run
git blameon conflicting sections - Fetch commit messages for context
- Determine the intent behind each change
4. Apply Resolution Strategy
Based on the analysis:
- Bugfixes generally take precedence over features
- Recent changes are often more relevant (unless older is a security fix)
- Combine non-conflicting changes when possible
- Preserve test updates alongside code changes
5. Complete Resolution
git add [resolved-files]
GIT_EDITOR=true git rebase --continue
Key Guidelines
- Always escape conflict markers with
\when usingapply_diff - Document resolution decisions in the summary
- Verify no syntax errors after resolution
- Preserve valuable changes from both sides when possible
Examples
/roo-resolve-conflicts #123- Resolve conflicts for PR #123/roo-resolve-conflicts 456- Resolve conflicts for PR #456
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.
- 2d ago First seen · 73 lines · 8 tokens per session scan A 79e5ebfe0da3
roo-resolve-conflicts is a command published in the GitHub repository RooCodeInc/Roo-Code (24,315 stars, last pushed 3mo ago), licensed Apache-2.0. It adds 8 tokens to every session and 445 once invoked, about $0.0000 per session on Opus 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.
Other commands, from other repositories
git
Git operations with intelligent commit messages and workflow optimization.
checklist
Generate a custom checklist for the current feature based on user requirements.
clarify
Identify underspecified areas in the current feature spec by asking up to 5 highly targeted clarification questions and encoding answers back into the spec.
specify
Create or update the feature specification from a natural language feature description.
analyze
Perform a non-destructive cross-artifact consistency and quality analysis across spec.md, plan.md, and tasks.md after task generation.
converge
Assess the current codebase against the feature's spec, plan, and tasks, then append any remaining unbuilt work as new tasks to tasks.md so implement can complete it.