root / sleep · 构建

Running with gitlab-ci-multi-runner 1.10.7 (bc69744)
Using SSH executor...
Running on iZm5ecs3ycd0p8nrpfny7nZ via iZm5ecs3ycd0p8nrpfny7nZ...
Fetching changes...
HEAD is now at 115feb8 XIAOPAN
From http://114.215.101.231:8099/root/sleep
   115feb8..799c2ba  master     -> origin/master
Checking out 799c2ba9 as master...
Skipping Git submodules setup
$ cd /alidata/www/w/sleep/
$ git pull
From http://114.215.101.231:8099/root/sleep
   115feb8..799c2ba  master     -> origin/master
error: Your local changes to the following files would be overwritten by merge:
	app/portal/controller/AdminFaultAuditController.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 17461bc..799c2ba
ERROR: Build failed: Process exited with: 1. Reason was:  ()