May 15, 2026 Rebase vs. merge, briefly Sergio Eraso #git Merge preserves history as it happened; rebase rewrites it to be linear. (Placeholder note.)