What is roo-conflict-resolution?

A set of instructions for resolving Git merge conflicts, which happen when separate code changes cannot be combined automatically.

Use it when rebasing a branch, resolving conflicts in a pull request, or deciding which parts of competing changes to keep.

It helps determine the intended code by examining commit history, commit messages, and who last changed the conflicting lines.

roo-conflict-resolution — Skill for Claude Code and Codex by zgsm-ai

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.

Any agent

npx skills add zgsm-ai/costrict --skill roo-conflict-resolution

Clone the repo

git clone --depth 1 https://github.com/zgsm-ai/costrict

Made for: Claude Code, Codex.

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.

README.md

[![agentmods](https://agentmods.dev/badge/skills/zgsm-ai/costrict/roo-conflict-resolution/github.svg)](https://agentmods.dev/skills/zgsm-ai/costrict/roo-conflict-resolution)

Your own site

<a href="https://agentmods.dev/skills/zgsm-ai/costrict/roo-conflict-resolution"><img src="https://agentmods.dev/badge/skills/zgsm-ai/costrict/roo-conflict-resolution/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.

Your own site · 80×15

<a href="https://agentmods.dev/skills/zgsm-ai/costrict/roo-conflict-resolution"><img src="https://agentmods.dev/badge/skills/zgsm-ai/costrict/roo-conflict-resolution.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

Per session 56 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.

When invoked 1,814 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 98% copy Near-identical to another mod 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.

Model	Per session	Once invoked
Fable 5.1	$0.00056	$0.01814
Opus 5.5	$0.00022	$0.00726
Sonnet 5.5	$0.00011	$0.00363
Haiku 4.5	$0.00006	$0.00181

Measured 2mo ago against content hash 4f7ab7c6e781, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

roo-conflict-resolution 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 2mo 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.

Origin

This is a copy

98% identical to roo-conflict-resolution — 34 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.

.roo/skills/roo-conflict-resolution/SKILL.md · 257 lines

How it starts

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

CoStrict Conflict Resolution Skill

When to Use This Skill

Use this skill when the task involves:

Resolving merge conflicts for a specific pull request
Rebasing a branch that has conflicts with the target branch
Understanding and analyzing conflicting code changes
Making intelligent decisions about which changes to keep, merge, or discard
Using git history to inform conflict resolution decisions

When NOT to Use This Skill

Do NOT use this skill when:

There are no merge conflicts to resolve
The task is about general code review without conflicts
You're working on fresh code without any merge scenarios

Workflow Overview

This skill resolves merge conflicts by analyzing git history, commit messages, and code changes to make intelligent resolution decisions. Given a PR number (e.g., "#123"), it handles the entire conflict resolution process.

Initialization Steps

Step 1: Parse PR Number

Extract the PR number from input like "#123" or "PR #123". Validate that a PR number was provided.

Step 2: Fetch PR Information

gh pr view [PR_NUMBER] --json title,body,headRefName,baseRefName

Get PR title and description to understand the intent and identify the source and target branches.

Step 3: Checkout PR Branch and Prepare for Rebase

gh pr checkout [PR_NUMBER] --force
git fetch origin main
GIT_EDITOR=true git rebase origin/main

Force checkout the PR branch to ensure clean state
Fetch the latest main branch
Attempt to rebase onto main to reveal conflicts
Use GIT_EDITOR=true to ensure non-interactive rebase

Step 4: Check for Merge Conflicts

git status --porcelain
git diff --name-only --diff-filter=U

Identify files with merge conflicts (marked with 'UU') and create a list of files that need resolution.

Main Workflow Phases

Phase 1: Conflict Analysis

Analyze each conflicted file to understand the changes:

Read the conflicted file to identify conflict markers
Extract the conflicting sections between <<<<<<< and >>>>>>>
Run git blame on both sides of the conflict
Fetch commit messages and diffs for relevant commits
Analyze the intent behind each change

Read the full file on GitHub · 257 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.

2mo ago First seen · 257 lines · 56 tokens per session scan A 4f7ab7c6e781

Subscribe to this mod's changes

roo-conflict-resolution is a skill published in the GitHub repository zgsm-ai/costrict (4,462 stars, last pushed 1mo ago), licensed Apache-2.0. It adds 56 tokens to every session and 1,814 once invoked, about $0.0002 per session on Opus 5.5. A static security scan graded it A with 0 findings. It is 98% identical to roo-conflict-resolution, differing in 34 lines, and is treated as a copy.

Git and workflow agent ai aicoding cline coding roocode

roo-conflict-resolution next to 6 skills from other repositories
Mod	Type	Stars	Last push	Licence	Scan	Tokens	Works with
roo-conflict-resolutionzgsm-ai/costrict	Skill	4.5k	1mo ago	Apache-2.0	A	56	Claude Code, Codex
issue-triagenearform/lastlight	Skill	44	2d ago	MIT	A	46	Claude Code, Codex
lastlight-clientnearform/lastlight	Skill	44	2d ago	MIT	A	101	Claude Code
repo-healthnearform/lastlight	Skill	44	2d ago	MIT	A	50	Claude Code, Codex
pr-commentnearform/lastlight	Skill	44	2d ago	MIT	A	41	Claude Code, Codex
issue-commentnearform/lastlight	Skill	44	2d ago	MIT	A	47	Claude Code, Codex
git-workflowaiming-lab/MetaClaw	Skill	3.5k	5mo ago	MIT	A	41	Claude Code, Codex