checkout, continue
controls the default action in the conflicts dialog box. actionin the conflicts dialog box displays check out nowas the default option.