Rebase

Mandatory Pre-Rebase Analysis

Complete all 5 steps before running git rebase.

Step 1 — Identify the merge base and branch files

MERGE_BASE=$(git merge-base <branch> <target>)
git diff <target>...<branch> --name-only        # files touched by the branch
git diff "${MERGE_BASE}..<target>" --name-only  # files changed on target since divergence

Step 2 — Diff overlapping files

For each file appearing in both lists above, read both sides: