jr-rebase

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.