失败
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 7c4e538 上传
From http://114.215.101.231:8099/anyv/xkeasy
826222b..5ad397f master -> origin/master
Checking out 5ad397f8 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xkeasy
$ git pull
From http://114.215.101.231:8099/anyv/xkeasy
826222b..5ad397f master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
data/runtime/log/201905/29.log
Please, commit your changes or stash them before you can merge.
Aborting
Updating e22fadf..5ad397f
ERROR: Build failed: Process exited with: 1. Reason was: ()