失败
7 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 097a346 修改自动化文字
From http://114.215.101.231:8099/root/automation
097a346..c9f539e master -> origin/master
Checking out c9f539ec as master...
Skipping Git submodules setup
$ cd /alidata/www/online/ciai.chinaciai.com.cn
$ git pull
From http://114.215.101.231:8099/root/automation
097a346..c9f539e master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
public/themes/simpleboot3/portal/index/index.html
Please, commit your changes or stash them before you can merge.
Aborting
Updating 097a346..c9f539e
ERROR: Build failed: Process exited with: 1. Reason was: ()