continue-rebase-interactively

Name: continue-rebase-interactively
Availability: InStock
Author: Inline

Summarize git rebase conflicts and present three resolution options.

680|24|Updated Sep 6, 2024

Search Tags:#git #workflow #interactive #rebase #developer #resolution #conflicts

Ready to run

npx skills add https://github.com/inline-chat/inline --skill continue-rebase-interactively

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: continue-rebase-interactively
Source: https://github.com/inline-chat/inline/tree/main/.codex/skills/continue-rebase-interactively
Command: npx skills add https://github.com/inline-chat/inline --skill continue-rebase-interactively

SYSTEM DOCUMENTATION & REQUIREMENTS

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.

Frequently Asked Questions about continue-rebase-interactively

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

FAQPage Schema

How do I resolve multiple git rebase conflicts automatically?▼

To resolve multiple git rebase conflicts, this Skill iterates through each conflicted file, summarizes the changes, and applies your chosen resolution before continuing the rebase automatically until completion.

What is the best way to choose between ours and theirs during a git merge conflict?▼

Choosing between ours and theirs during a git merge conflict is handled by presenting three options: A (ours), B (theirs), and C (both with a surgical refactor), with a recommended choice marked for each conflict.

How do I continue an in-progress git rebase after fixing conflicts?▼

To continue an in-progress git rebase after fixing conflicts, the Skill applies your selected resolution, stages the changes, and runs the continue command automatically for the next conflict.

Can I use interactive conflict resolution for git stash-apply workflows?▼

Yes, interactive conflict resolution applies to git stash-apply workflows, as the Skill detects conflict states across rebases, merges, and stash-applies to guide resolution.

Does this git rebase conflict resolution provide a summary of changes?▼

Yes, this git rebase conflict resolution provides a concise gist summarizing what changes from both sides for each conflicted file before presenting the resolution options.

What happens when a surgical refactor is chosen for a git conflict?▼

When a surgical refactor is chosen for a git conflict, the Skill applies changes from both sides with a surgical refactor, stages the file, and continues the interactive rebase loop.