失败
6 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 87ac50e 更新 .gitlab-ci.yml
Checking out 87ac50ed as master...
Skipping Git submodules setup
$ cd /alidata/www/w/caiji/
$ git pull
From http://114.215.101.231:8099/panhaowen/caiji
97aec72..87ac50e master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
app/portal/controller/IndexController.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 97aec72..87ac50e
ERROR: Build failed: Process exited with: 1. Reason was: ()