失败
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 62baa67 修改
Checking out 6ca41ebb as master...
Skipping Git submodules setup
$ cd /alidata/www/online/m.wanlin-edu.com
$ git pull
error: Your local changes to the following files would be overwritten by merge:
app/portal/controller/MemberSalesController.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 09987a2..6ca41eb
ERROR: Build failed: Process exited with: 1. Reason was: ()