失败
1 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 0e22857 后台用户列表总收入修改
From http://114.215.101.231:8099/anyv/xkeasy
0e22857..8dc348e master -> origin/master
Checking out 8dc348e0 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xkeasy
$ git pull
From http://114.215.101.231:8099/anyv/xkeasy
0e22857..8dc348e master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
public/themes/admin_simpleboot3/admin/orderscourier/order_list.html
Please, commit your changes or stash them before you can merge.
Aborting
Updating 7205b51..8dc348e
ERROR: Build failed: Process exited with: 1. Reason was: ()