Zoo Code is a code-editor extension that provides a team of AI agents for software development. Developers use it for coding assistance, code search, task coordination, and autonomous work, while the catalogue entries extend its workflows.
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.
git clone --depth 1 https://github.com/Zoo-Code-Org/Zoo-CodeWrote 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.
[](https://agentmods.dev/commands/zoo-code-org/zoo-code/roo-resolve-conflicts)<a href="https://agentmods.dev/commands/zoo-code-org/zoo-code/roo-resolve-conflicts"><img src="https://agentmods.dev/badge/commands/zoo-code-org/zoo-code/roo-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.
<a href="https://agentmods.dev/commands/zoo-code-org/zoo-code/roo-resolve-conflicts"><img src="https://agentmods.dev/badge/commands/zoo-code-org/zoo-code/roo-resolve-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>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.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00008 | $0.00445 |
| Opus 5.5 | $0.00003 | $0.00178 |
| Sonnet 5.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 8d 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.
This is a copy
100% identical to roo-resolve-conflicts — 10 lines differ, which has more behind it and is treated as the original. This page carries a canonical link to it rather than competing with it.
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.
- 8d ago Changed · +2 lines 24dd17ed9159
- 1mo ago First seen · 73 lines · 8 tokens per session scan A 79e5ebfe0da3
roo-resolve-conflicts is a command published in the GitHub repository Zoo-Code-Org/Zoo-Code (2,014 stars, last pushed today), licensed Apache-2.0. It adds 8 tokens to every session and 445 once invoked, about $0.0000 per session on Opus 5.5. A static security scan graded it A with 0 findings. It is 100% identical to roo-resolve-conflicts, differing in 10 lines, and is treated as a copy.
Other commands, from other repositories
elegant-code-review
Review the current working diff against the elegant-code decision ladder and propose deletions, honoring the negligence floor.
git
The pre-finish status: branch, hygiene findings, message checks, workflow lint, template state.
prp-commit
Quick commit with natural language file targeting: describe what to commit in plain English.
gsd:pr-branch
Create a clean PR branch by filtering out .planning/ commits — ready for code review.
karpathy-check
Revisa as alterações em stage (ou o último commit) com base nos 4 princípios de codificação do Karpathy. Verifica complexidade, ruído no diff, suposições ocultas e verificação de objetivos. Uso: /karpathy-check [--last-commit].
validate-pr-description
Use when validating a PR title and description for conventional commit format, issue linking keywords, and template compliance before submission.