How to succeed at merging

by David Brancaccio