Git Merge and Rebase

Goal

Run a merge, rebase, or rebase --onto sequence from the current branch with explicit inputs, optional review pauses, and a completion summary. Follow every step even when the repository appears clean so results stay consistent and traceable.

Conventions

The git-merge instructions own workspace preparation, the operation commands, conflict resolution, finishing steps, and the no-push guardrail. Apply them at every step below.

Inputs

• operation (optional, default merge): merge, rebase, or rebase-onto.
• branch (required): the branch or ref to merge, or the rebase target. Ask for it when it is missing.
• onto (required for rebase-onto): the new base.
• upstream (optional, used by rebase-onto): the branch or commit that bounds the commits to move.
• conflict-stop (optional, default false): when true, pause after each set of conflict fixes for user review before continuing.

Flow