A guide for resolving Git merge and rebase conflicts across a stack of branches. A rebase reapplies changes onto newer commits, while a stack is a series of related branches or changes.

It helps inspect repository status, identify Git Town, Charcoal, or native Git workflows, resolve conflicts, and continue rebasing until the stack is clean.

It helps finish a rebase or restack when Git reports conflicting files, instead of leaving the repository in a paused state. It also identifies the stacking tool in use and continues through later branches.

rebase-fix — Skill for Claude Code and Codex by wrannaman

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 wrannaman/agentic-engineering --skill rebase-fix

Clone the repo

git clone --depth 1 https://github.com/wrannaman/agentic-engineering

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/wrannaman/agentic-engineering/rebase-fix/github.svg)](https://agentmods.dev/skills/wrannaman/agentic-engineering/rebase-fix)

Your own site

<a href="https://agentmods.dev/skills/wrannaman/agentic-engineering/rebase-fix"><img src="https://agentmods.dev/badge/skills/wrannaman/agentic-engineering/rebase-fix/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/wrannaman/agentic-engineering/rebase-fix"><img src="https://agentmods.dev/badge/skills/wrannaman/agentic-engineering/rebase-fix.svg" alt="Reviewed on agentmods" width="80" height="20"></a>

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

When invoked 2,913 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.

Model	Per session	Once invoked
Fable 5.1	$0.00068	$0.02913
Opus 5.5	$0.00027	$0.01165
Sonnet 5.5	$0.00014	$0.00583
Haiku 4.5	$0.00007	$0.00291

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

Security

Grade A, and why

rebase-fix 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.

skills/git/rebase-fix/SKILL.md · 293 lines

How it starts

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

Rebase Fix

Resolve merge and rebase conflicts iteratively across an entire stack, continuing the restack until every branch is clean. Works with any stacking client (Charcoal/Graphite, Git Town, native git) or a plain git rebase.

When to Use

A rebase or restack stopped due to merge conflicts
The user says "fix rebase", "fix conflicts", "resolve conflicts"
git status shows UU (unmerged) files
A stacking client reports a conflict during gt sr, git town sync, or similar

Process

Step 1: Detect Stack Client, Rebase State, and Stack Shape

Use the git-stacks KB partition as the shared source of truth for git-client detection:

list_kb_documents for partition git-stacks
read_kb_document_by_path for /index.md
Run the detection order from /index.md in parallel with:

git status

Use git-stacks/index.md to classify charcoal or git-town. If neither dedicated client is detected, classify native-git only when git status shows a rebase, cherry-pick, or unresolved conflicts. Otherwise classify none.

If client != none, read the matching KB client doc before continuing:

charcoal → /charcoal.md
git-town → /git-town.md
native-git → /native-git.md

After classification, use this skill-specific command map:

Condition	Client	Sync Command	Continue Command	Restack Command	Stack Enumerate
Dedicated client is `charcoal`	`charcoal`	`gt repo sync --no-interactive`	`gt continue`	`gt stack restack --no-interactive`	`gt log short`
Dedicated client is `git-town`	`git-town`	N/A	`git town continue`	`git town sync`	`git town branch`
No dedicated client, but `git status` shows active rebase/conflicts	`native-git`	N/A	`git rebase --continue`	N/A	N/A
No dedicated client and no active rebase/conflicts	`none`	N/A	N/A	N/A	N/A

Sync client state before restacking

Read the full file on GitHub · 293 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 · 293 lines · 68 tokens per session scan A 202d6ae59bd0

Subscribe to this mod's changes

rebase-fix is a skill published in the GitHub repository wrannaman/agentic-engineering (2 stars, last pushed 6mo ago), licensed MIT. It adds 68 tokens to every session and 2,913 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-31.

Git and workflow

rebase-fix next to 6 skills from other repositories
Mod	Type	Stars	Last push	Licence	Scan	Tokens	Works with
rebase-fixwrannaman/agentic-engineering	Skill	2	6mo ago	MIT	A	68	Claude Code, Codex
merge-batchdiegosouzapw/OmniRoute	Skill	83k	6d ago	MIT	A	46	Claude Code
prowler-commitprowler-cloud/prowler	Skill	15k	today	Apache-2.0	A	44	Claude Code, Codex
gh-auth-isolationgithub/gh-aw	Skill	5.6k	today	MIT	A	20	Claude Code, Codex
comet-githubrpamis/comet	Skill	3.3k	yesterday	MIT	A	72	Claude Code, Codex
github-skillzeenie-ai/OpenCompany	Skill	1.1k	2d ago	MIT	A	51	Claude Code
release-helperSahir619/fable-method	Skill	2.3k	1mo ago	MIT	A	43	Claude Code