失败
8 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using Shell executor...
Running on ecs-a18d-0017...
Fetching changes...
HEAD is now at 7e7110e 二开海报
From http://114.215.101.231:8099/heshupeng/recruit
7e7110e..5d8caa4 master -> origin/master
Checking out 5d8caa45 as master...
Skipping Git submodules setup
$ whoami
www
$ cd /home/wwwroot/t/recruit
$ git pull
From http://114.215.101.231:8099/heshupeng/recruit
7e7110e..5d8caa4 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
application/extra/site.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 7e7110e..5d8caa4
ERROR: Build failed: exit status 1