失败
1 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at b613930 图片替换
From http://114.215.101.231:8099/liuzhen/qiaohu
15109e9..55b26fe master -> origin/master
Checking out 55b26fea as master...
Skipping Git submodules setup
$ cd /alidata/www/online/m.wanlin-edu.com
$ git pull
From http://114.215.101.231:8099/liuzhen/qiaohu
15109e9..55b26fe master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
public/themes/simpleboot3/public/mobile/images/tucengf.png
Please, commit your changes or stash them before you can merge.
Aborting
Updating 15109e9..55b26fe
ERROR: Build failed: Process exited with: 1. Reason was: ()