Merge isn't better or worse, just different

Merge

• Faster, resolve fewer conflicts

• Good for showing that two branches have joined

Rebase

• Clearer history

• Good for showing that two branches have not joined

Next