checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore