失败
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 1533bab 发票信息
From http://114.215.101.231:8099/guosheng/areial
1533bab..1e9c79f master -> origin/master
Checking out 1e9c79fe as master...
Skipping Git submodules setup
$ cd /alidata/www/fast/areial
$ git pull
From http://114.215.101.231:8099/guosheng/areial
1533bab..1e9c79f master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
.idea/workspace.xml
application/admin/controller/Order.php
application/api/controller/User.php
public/api.html
public/assets/js/backend/order.js
Please, commit your changes or stash them before you can merge.
Aborting
Updating 5c1552f..1e9c79f
ERROR: Build failed: Process exited with: 1. Reason was: ()