Commit 7711fa5f authored by Francesc Guasch's avatar Francesc Guasch
Browse files

Merge branch 'develop' of into develop

parents 32ec132a 0881f9be
......@@ -118,7 +118,8 @@ sub rebase($self, $new_base) {
my ($out, $err) = $self->vm->run_command(@cmd);
confess $err if $err;
confess $err if $err && $err !~ /Failed to get write lock/;
warn "Warning: $err" if $err;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment