失败
3 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at be6ab34 修改订单管理
From http://114.215.101.231:8099/guosheng/areial
be6ab34..2630558 master -> origin/master
Checking out 2630558f as master...
Skipping Git submodules setup
$ cd /alidata/www/fast/areial
$ git pull
From http://114.215.101.231:8099/guosheng/areial
be6ab34..2630558 master -> origin/master
error: The following untracked working tree files would be overwritten by merge:
addons/qiniu/Qiniu.php
addons/qiniu/bootstrap.js
addons/qiniu/config.php
addons/qiniu/controller/Index.php
addons/qiniu/info.ini
addons/qiniu/library/Auth.php
Please move or remove them before you can merge.
Aborting
Updating be6ab34..2630558
ERROR: Build failed: Process exited with: 1. Reason was: ()