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 skills/dryvist/claude-code-plugins/troubleshoot-rebasenpx skills add dryvist/claude-code-plugins --skill troubleshoot-rebasegit clone --depth 1 https://github.com/dryvist/claude-code-pluginsWrote 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/skills/dryvist/claude-code-plugins/troubleshoot-rebase)<a href="https://agentmods.dev/skills/dryvist/claude-code-plugins/troubleshoot-rebase"><img src="https://agentmods.dev/badge/skills/dryvist/claude-code-plugins/troubleshoot-rebase.svg" alt="Measured on agentmods" 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.00015 | $0.00881 |
| Opus 5 | $0.00008 | $0.00441 |
| Sonnet 5 | $0.00003 | $0.00176 |
| Haiku 4.5 | $0.00002 | $0.00088 |
Grade A, and why
troubleshoot-rebase 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 5d 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.
How it starts
The opening of the file, as written. The whole thing — 94 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Git Rebase Troubleshoot
Diagnose and recover from rebase failures. Invoke when standard rebase error handling cannot resolve the issue.
Quick Diagnosis
Check: pwd, git status, git branch --show-current, git worktree list, gh pr view.
Resolve the repo's default branch before any rebase — it is the correct rebase
target, not necessarily main:
DEFAULT_BRANCH=$(gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name')
main on a git-flow repo (default branch develop, see /gh-cli-patterns
Canonical Default-Branch Detection in github-workflows) is never a rebase
target — it takes merge commits only. Feature branches there rebase onto
develop, and only a hotfix/* branch legitimately rebases onto main.
Error: Push Rejected (Non-Fast-Forward)
Branches have diverged. First, confirm your current branch: git branch --show-current.
-
If this is a feature branch (for example
feature/foo) and the push was rejected:- Rebase onto the latest default branch:
git fetch origin --force && git rebase origin/<DEFAULT_BRANCH> - Then push your feature branch:
git push --force-with-lease origin HEAD
- Rebase onto the latest default branch:
-
If you are on
<DEFAULT_BRANCH>and are behindorigin/<DEFAULT_BRANCH>, do not rebase it:- Update it:
git fetch origin --force && git reset --hard origin/<DEFAULT_BRANCH> - Then retry your original operation (for example, rebase your feature branch onto
<DEFAULT_BRANCH>and push the feature branch).
- Update it:
If the rebase fails because origin/<DEFAULT_BRANCH> moved again, repeat: fetch, rebase your feature branch, then push with --force-with-lease.
Error: Repository Rule Violations
GH013 error about PR/status checks. This is NOT a block if commits are from approved PR.
Causes: CI not passing, reviews not approved, merge conflict.
Fix order: Rebase feature -> push (triggers CI) -> wait for checks -> merge to <DEFAULT_BRANCH> -> push.
Check: gh pr view <branch> --json checks,reviews,statusCheckRollup
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.
- 5d ago First seen · 94 lines · 15 tokens per session scan A b66ef059af8f
troubleshoot-rebase is a skill published in the GitHub repository dryvist/claude-code-plugins (3 stars, last pushed today), licensed Apache-2.0. It adds 15 tokens to every session and 881 once invoked, about $0.0001 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-31.
Other skills, from other repositories
rspec
This skill should be used when the user asks to "write specs", "create spec", "add RSpec tests", "fix failing spec", or mentions RSpec, describe blocks, it blocks, expect syntax, test doubles, or matchers. Should also be used when editing spec.rb files, working in spec/ directory, planning implementation phases that…
activerecord
This skill should be used when the user asks to "write a migration", "add a column", "add column to table", "create an index", "add a foreign key", "set up associations", "fix N+1 queries", "optimize queries", "add validations", "create callbacks", "use eager loading", or mentions ActiveRecord, belongsto, hasmany…
draper-decorators
This skill should be used when the user asks to "create a decorator", "write a decorator", "move logic into decorator", "clean logic out of the view", "isn't it decorator logic", "test a decorator", or mentions Draper, keeping views clean, or representation logic in decorators. Should also be used when editing…
mcp-server
This skill should be used when the user asks to "create an MCP server", "build MCP tools", "define MCP prompts", "register MCP resources", "implement Model Context Protocol", or mentions the mcp gem, MCP::Server, MCP::Tool, JSON-RPC transport, stdio transport, or streamable HTTP transport. Should also be used when…
ratatui-ruby
This skill should be used when the user asks to "create a TUI", "terminal interface", "terminal UI", "ratatui", "ratatui-ruby", "inline viewport", "full-screen terminal app", "terminal widgets", "tui.draw", "tui.pollevent", or mentions RatatuiRuby.run, managed loop, terminal rendering, Tea MVU, or building CLI…
dragonruby
This skill should be used when the user asks to "create a game", "make a game", "game development", "dragonruby", "drgtk", "game loop", "tick method", "sprite rendering", "game state", or mentions args.outputs, args.state, args.inputs, coordinate system, collision detection, animation frames, or scene management.…