失败
12 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using Shell executor...
Running on ecs-a18d-0014...
Fetching changes...
HEAD is now at 9dae429 联查时间范围查询bug修改
From http://114.215.101.231:8099/guosheng/enterprise
9dae429..b6677a6 master -> origin/master
Checking out b6677a6d as master...
Skipping Git submodules setup
$ cd /home/wwwroot/fast/enterprisetest
$ git pull
From http://114.215.101.231:8099/guosheng/enterprise
9dae429..b6677a6 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
application/config.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 9a1ebdb..b6677a6
ERROR: Build failed: exit status 1