jr-rebase

Resolves git rebase conflicts in feature branches via guided marker resolution.

Updated Apr 8, 2026

Search Tags:#git #workflow #branching #rebase #conflict-resolution #version-control #conflicts

Ready to run

npx skills add https://github.com/bmsull560/Fabric_4L --skill jr-rebase

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: jr-rebase
Source: https://github.com/bmsull560/Fabric_4L/tree/main/.windsurf/skills/jr-rebase
Command: npx skills add https://github.com/bmsull560/Fabric_4L --skill jr-rebase

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Resolve git rebase conflicts in feature branches to maintain a clean, linear history.

Core Features & Use Cases

Guided conflict detection and marker navigation to understand mismatches between HEAD and incoming changes.
Step-by-step guidance for selecting, merging, or discarding conflicting hunks with minimal disruption to feature work.
Workflow templates for common rebase scenarios (upstream merged, upstream not yet merged, or multi-commit rebases).

Quick Start

Start by running git status to identify conflicts, resolve each conflicting file by editing the conflict markers, stage the resolved files with git add, and continue the rebase with git rebase --continue until the process completes.

Frequently Asked Questions about jr-rebase

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

FAQPage Schema

How do I resolve git rebase conflicts in a feature branch?▼

To resolve git rebase conflicts in a feature branch, run git status to identify conflicts, edit files to remove conflict markers, stage resolved files with git add, and run git rebase --continue until the process completes with a clean history.

What is the best way to handle multi-commit rebases when upstream changes cause conflicts?▼

For multi-commit rebases with upstream conflicts, use workflow templates that guide marker navigation and hunk selection step-by-step, allowing you to merge or discard changes with minimal disruption to feature work.

How do git rebase conflict markers help me understand mismatches between HEAD and incoming changes?▼

Git rebase conflict markers visually delineate mismatches between HEAD and incoming changes, enabling guided conflict detection so you can understand differences and select, merge, or discard conflicting hunks accurately.

When should I rebase a feature branch onto an upstream branch that has not been merged yet?▼

You should rebase a feature branch onto an unmerged upstream branch to maintain a clean, linear history, applying workflow templates to resolve any resulting merge conflicts and complete the rebase.

Can I discard conflicting hunks during a git rebase to minimize disruption to my feature work?▼

Yes, you can discard conflicting hunks during a git rebase by following step-by-step guidance for selecting, merging, or discarding mismatches, ensuring minimal disruption to your feature work while maintaining clean history.

Why does my git rebase stop at conflicts and how do I complete it?▼

A git rebase stops at conflicts when mismatches occur between branches; complete it by resolving markers, staging files with git add, and executing git rebase --continue until all conflicts are resolved and the rebase finishes.