失败
7 秒
Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Cloning repository...
Cloning into 'builds/fed65292/0/outsource/signUpForCar'...
Checking out aa5ec708 as master...
Skipping Git submodules setup
$ cd /alidata/www/ser/wei/dm161xueche
$ git pull
From http://114.215.101.231:8099/outsource/signUpForCar
9084c0a..aa5ec70 master -> origin/master
error: Your local changes to the following files would be overwritten by merge:
app/user/controller/CommentController.php
public/themes/simpleboot3/user/comment/look_jindu.html
public/themes/simpleboot3/user/yuyue/my_yuyue.html
Please, commit your changes or stash them before you can merge.
Aborting
Updating 9084c0a..aa5ec70
ERROR: Build failed: Process exited with: 1. Reason was: ()