Use a merge ff-only merge instead of a checkout