失败
1 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using Shell executor...
Running on ecs-a18d-0017...
Fetching changes...
HEAD is now at 7131f2c 商圈信息、充值、周边热点部分接口开发
From http://114.215.101.231:8099/guosheng/community
42f8f44..1e2e8a8 master -> origin/master
Checking out 1e2e8a8d as master...
Skipping Git submodules setup
$ whoami
www
$ cd /home/wwwroot/t/community
$ git pull
From http://114.215.101.231:8099/guosheng/community
42f8f44..1e2e8a8 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
public/api.html
Please, commit your changes or stash them before you can merge.
Aborting
Updating 42f8f44..1e2e8a8
ERROR: Build failed: exit status 1