失败
4 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 5bcf69b 修改订单中联系人电话
From http://114.215.101.231:8099/guosheng/areial
5bcf69b..c6ede7f master -> origin/master
Checking out c6ede7f5 as master...
Skipping Git submodules setup
$ cd /alidata/www/fast/areial
$ git pull
From http://114.215.101.231:8099/guosheng/areial
5bcf69b..c6ede7f master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
.idea/workspace.xml
Please, commit your changes or stash them before you can merge.
Aborting
Updating 0ccc754..c6ede7f
ERROR: Build failed: Process exited with: 1. Reason was: ()