skills.rest
JacobPEvans
JacobPEvansCOMMUNITY
Explore all skills by this author →
GitHub

troubleshoot-rebase

Diagnose Git rebase failures and recover from merge conflicts.

3|1|Updated Jan 1, 2026
Search Tags:#git#developer tools#version control#troubleshooting#rebase#conflict resolution
One-click install
npx skills add https://github.com/JacobPEvans/claude-code-plugins --skill troubleshoot-rebase
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: troubleshoot-rebase
Source: https://github.com/JacobPEvans/claude-code-plugins/tree/main/git-workflows/skills/troubleshoot-rebase
Command: npx skills add https://github.com/JacobPEvans/claude-code-plugins --skill troubleshoot-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill helps developers diagnose and recover from common and complex Git rebase failures, preventing project delays and data loss.

Core Features & Use Cases

  • Rebase Failure Diagnosis: Identifies the root cause of "push rejected" and "repository rule violations."
  • Conflict Resolution Guidance: Provides steps to resolve merge conflicts during rebasing.
  • Recovery Procedures: Offers commands to abort in-progress rebases and recover from failed operations.
  • Use Case: When a git rebase origin/main command fails due to divergent branches or merge conflicts, this Skill guides you through safely resolving the issue and pushing your changes.

Quick Start

Use the troubleshoot-rebase skill to help resolve a git rebase conflict.

Frequently Asked Questions about troubleshoot-rebase

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve a git rebase failure with divergent branches?▼

To resolve a git rebase failure, diagnose the root cause of push rejections and repository rule violations, then apply specific recovery procedures to fix merge conflicts and safely push your changes.

How do I abort a failed git rebase and recover my changes?▼

To abort a failed git rebase, you execute specific recovery commands to cancel the in-progress operation, which safely recovers your branch from the failed state without losing data.

Why does git rebase origin/main fail with repository rule violations?▼

A git rebase origin/main fails with repository rule violations when standard Git error handling is insufficient for resolving divergent branches, requiring detailed diagnosis to identify the specific root cause.

Do I need GitHub CLI to troubleshoot git rebase conflicts?▼

You need the Git CLI to troubleshoot git rebase conflicts, and you can optionally use GitHub CLI for detailed PR status checks to better understand repository rule violations.

What is the best way to fix merge conflicts during a git rebase?▼

The best way to fix merge conflicts during a git rebase is to follow structured conflict resolution guidance that provides specific steps to resolve divergent branches and safely push your changes.

Related Skills

Explore More Software Engineering Skills→
Kord96Kord96

publish

Push the current git branch to origin with optional draft PR and Codex review.

Community
Intermediate
malinskibeniaminmalinskibeniamin
3

commit-push-pr

Automate commit, push, and pull request creation with CI monitoring.

Community
Advanced
cryfscryfs
2.3k

jujutsu

Manage version control workflows with JJ, a Git-compatible system.

Official
Basic
rafaelromaorafaelromao
5

sandman-back-merge

Merge a base branch into the current branch without rewriting history.

Community
Advanced