How does this skill handle rejected pushes?

It determines if you are on a feature branch or main. For feature branches, it performs a fetch and rebase followed by a safe force-with-lease. For main, it uses a hard reset to align with the origin.

What happens if a rebase goes completely wrong?

The skill includes a recovery workflow using 'git rebase --abort' and, in extreme cases, provides instructions for inspecting 'git reflog' to restore previous branch states.

Can it resolve GitHub GH013 repository rule violations?

Yes, it uses the GitHub CLI to inspect PR reviews and status checks, then suggests a specific fix order: rebase, push to trigger CI, and wait for checks before merging.

Is it safe to use when I have merge conflicts?

Absolutely. It identifies unmerged files, guides the resolution process, and ensures 'git rebase --continue' is only called after files are properly staged.

Git Rebase Troubleshooter

Name: Git Rebase Troubleshooter
Author: JacobPEvans

byJacobPEvans

•

开发者工具

Diagnoses and resolves complex Git rebase failures, push rejections, and merge conflicts within Claude Code.

The Git Rebase Troubleshooter skill provides Claude with a specialized diagnostic framework for navigating the complexities of Git rebase operations. It enables the agent to handle 'non-fast-forward' push rejections, GitHub repository rule violations (GH013), and nested repository errors with precision. By following a standardized diagnostic workflow—evaluating branch status, worktree lists, and PR metadata—it ensures safe recovery from interrupted rebases and provides clear paths for syncing feature branches with upstream changes without risking data loss or using destructive commands like global force pushes.

主要功能

01Detection and cleanup of embedded Git repositories and nested .git directories.

022 GitHub stars

03Automated diagnosis of 'non-fast-forward' push rejections and branch divergence.

04Safe recovery protocols including rebase-abort and reflog-based escalation.

05Guided resolution for GH013 repository rule violations and PR status check blocks.

06Verification checks to ensure synchronization with origin/main before retrying operations.

使用场景

01Resolving rejected pushes on feature branches after the main branch has moved forward.

02Troubleshooting GitHub-specific merge blocks related to CI checks and branch protection rules.

03Fixing stuck rebase states where conflicts or manual edits have interrupted the workflow.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jacobpevans/claude-code-plugins troubleshoot-rebase

For use in Claude.ai and ChatGPT

Download Skill