Merge vs Rebase

by ed wassermann