Rebase vs. merge, briefly

Rebase vs. merge, briefly

Sergio Eraso

Merge preserves history as it happened; rebase rewrites it to be linear. (Placeholder note.)