失败
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 2fe1bf7 修改七牛配置
From http://114.215.101.231:8099/guosheng/areial
2fe1bf7..dd19a85 master -> origin/master
Checking out dd19a85a as master...
Skipping Git submodules setup
$ cd /alidata/www/fast/areial
$ git pull
From http://114.215.101.231:8099/guosheng/areial
2fe1bf7..dd19a85 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
.idea/workspace.xml
addons/qiniu/config.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 79cb1c6..dd19a85
ERROR: Build failed: Process exited with: 1. Reason was: ()