失败
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 b7c1938 海报
From http://114.215.101.231:8099/anyv/xkeasy
b7c1938..3a3b9cc master -> origin/master
Checking out 3a3b9cc4 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xkeasy
$ git pull
From http://114.215.101.231:8099/anyv/xkeasy
b7c1938..3a3b9cc master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
public/themes/simpleboot3/portal/share/to_user.html
Please, commit your changes or stash them before you can merge.
Aborting
Updating b7c1938..3a3b9cc
ERROR: Build failed: Process exited with: 1. Reason was: ()