Also document using the recursive/ours merge strategy, because
it's almost certainly what we want to do in this case.