|
@@ -86,9 +86,7 @@ class GetSource extends Command
|
|
$git->merge("origin/" . $conf["branch"]);
|
|
$git->merge("origin/" . $conf["branch"]);
|
|
}
|
|
}
|
|
} catch (GitException $e) {
|
|
} catch (GitException $e) {
|
|
- $output->writeln($e->getTraceAsString());
|
|
|
|
-
|
|
|
|
- die;
|
|
|
|
|
|
+ $output->writeln("<error>" . $e->getMessage() . "</error>");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|