Commit a847872d authored by Karl Kornel's avatar Karl Kornel
Browse files

Ignore drive conflicts

parent af280ac3

bbox-workflow-nextseq

+1 −1
Original line number Diff line number Diff line
@@ -424,7 +424,7 @@ EOF 
	my $drive_exit_code;

	dolog("Running drive pull\n");

	$drive_exit_code = drive_run($DRIVECOMMAND, 'pull', '-no-prompt',

		                     '-verbose', '.');

		                     '-ignore-conflict', '-verbose', '.');

	return unless defined($drive_exit_code);



	# If we got return code 13, then we need to fix clashes and re-pull