失败
0 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 6ab49cc 修改图片比例
From http://114.215.101.231:8099/jinglong/xingqiu
6ab49cc..f1f7943 master -> origin/master
Checking out f1f7943d as master...
Skipping Git submodules setup
$ cd /alidata/www/w/xingqiu
$ git pull
From http://114.215.101.231:8099/jinglong/xingqiu
6ab49cc..f1f7943 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
data/lang/zh-cn/admin_menu.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating b366c97..f1f7943
ERROR: Build failed: Process exited with: 1. Reason was: ()