Skills
.Work. You
Rest

continue-rebase-interactively

Official

Interactively resolve git rebase conflicts.

Software Engineering#git#workflow#interactive#rebase#developer#resolution#conflicts
Authorinline-chat
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill helps developers manage an in-progress git rebase with conflicts by summarizing each conflict and offering three resolution options.

Core Features & Use Cases

  • Conflict summarization: For each conflicted file, generate a concise gist of what changes from both sides.
  • Three-option resolutions: For every conflict, present A (ours), B (theirs), or C (both with surgical refactor) with a recommended choice.
  • Interactive application loop: Apply the chosen resolution, stage changes, and continue automatically until the rebase completes.
  • Use Case: When rebasing feature branches with multiple edits across files, guide you through every conflict and finish rebase with minimal manual editing.

Quick Start

Start a rebase with conflicts and let this Skill guide you to resolve each conflict one by one.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: continue-rebase-interactively
Download link: https://github.com/inline-chat/inline/archive/main.zip#continue-rebase-interactively

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.