continue-rebase-interactively

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.

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.

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.

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.

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.

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.