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

Ignore drive conflict in a few more places

parent 64e9c75d

bbox-workflow-nextseq

+4 −4
Original line number Diff line number Diff line
@@ -431,9 +431,9 @@ EOF 
	while ($drive_exit_code == 13) {

		$drive_exit_code = drive_run($DRIVECOMMAND, 'pull',

                                     '-no-prompt', '-verbose',

					     '-fix-clashes');

                                     '-ignore-conflict', '-fix-clashes');

		return unless defined($drive_exit_code);

		$drive_exit_code = drive_run($DRIVECOMMAND, 'pull',

		$drive_exit_code = drive_run($DRIVECOMMAND, 'pull', '-ignore-conflict',

                                     '-no-prompt', '-verbose', '.');

		return unless defined($drive_exit_code);

	}