Running with gitlab-runner 14.5.2 (e91107dd)
  on civ_base b953312c
section_start:1661247973:prepare_executor
Preparing the "shell" executor
Using Shell executor...
section_end:1661247973:prepare_executor
section_start:1661247973:prepare_script
Preparing environment
Running on CIV128...
section_end:1661247974:prepare_script
section_start:1661247974:get_sources
Getting source from Git repository
Skipping Git repository setup
Skipping Git checkout
Skipping Git submodules setup
section_end:1661247974:get_sources
section_start:1661247974:step_script
Executing "step_script" stage of the job script
$ chcp 65001
Active code page: 65001
$ git config core.autocrlf false
$ cd "${TARGET_REPO_2021}"
$ git reset --hard head
HEAD is now at ea7955eae auto package civmanage.
$ git clean -fd
$ git remote set-url origin "https://${GIT_ACCESS_USER}:${GIT_ACCESS_PASSWORD}@g.civnet.cn:8443/CivPublish/CivWebPublish2021.git"
$ git pull origin map
From https://g.civnet.cn:8443/CivPublish/CivWebPublish2021
 * branch                map        -> FETCH_HEAD
   ea7955eae..85069b909  map        -> origin/map
Auto packing the repository in background for optimum performance.
See "git help gc" for manual housekeeping.
Nothing new to pack.
warning: There are too many unreachable loose objects; run 'git prune' to remove them.
warning: fetch updated the current branch head.
fast-forwarding your working tree from
commit ea7955eae303604b3438fe504750f30548dcaf62.
error: Your local changes to the following files would be overwritten by merge:
	CityInterface/bin/CityServer.OA.dll
	PandaEnergy/GZshuiwuju/GZshuiwuju.ApplicationCore.dll
	PandaEnergy/GZshuiwuju/GZshuiwuju.ApplicationCore.xml
	PandaEnergy/GZshuiwuju/GZshuiwuju.Web.dll
	PandaEnergy/WaterSaving/GZshuiwuju.ApplicationCore.dll
	PandaEnergy/WaterSaving/GZshuiwuju.ApplicationCore.xml
	PandaEnergy/WaterSaving/WaterSaving.ApplicationCore.dll
	PandaEnergy/WaterSaving/WaterSaving.Web.dll
	PandaGIS/MapServer/CityServer.DrawTool.dll
	PandaGIS/MapServer/CityServer.Edit.dll
	PandaGIS/MapServer/CityServer.GeoServer.dll
	PandaGIS/MapServer/MapServer.ApplicationCore.dll
	PandaGIS/MapServer/MapServer.Web.dll
	PandaGIS/MapServer/MapServer.Web.xml
	PandaWorkFlow/WorkFlow/CaseCenter.ApplicationCore.dll
	PandaWorkFlow/WorkFlow/CaseCenter.Web.dll
	PandaWorkFlow/WorkFlow/CaseCenter.Web.xml
	PandaWorkFlow/WorkFlow/DevicePlan.ApplicationCore.dll
	PandaWorkFlow/WorkFlow/GZshuiwuju.ApplicationCore.dll
	PandaWorkFlow/WorkFlow/Informatization.ApplicationCore.dll
	civ_energy/index.html
	civ_iot/index.html
	civ_pandawork/index.html
	civmanage/index.html
	web4/index.html
	web4/product/hydraulicmodel2.0/PipenetPartition/IsolineDisplay.js
	web4/product/hydraulicmodel2.0/PipenetPartition/PressureLegendPanel.js
	web4/project/garden/guangzhou/waterBalancePlan/waterBalancePlan.js
	web4/project/water/pizhou/DispatchBI/DispatchBI.html
	web4/project/water/pizhou/DispatchBI/DispatchBI.js
	web4/project/water/zhanhua/WaterWorksBI/WaterWorksBI.js
	web4/sourcemaps/product/hydraulicmodel2.0/PipenetPartition/IsolineDisplay.js.map
	web4/sourcemaps/product/hydraulicmodel2.0/PipenetPartition/PressureLegendPanel.js.map
	web4/sourcemaps/project/garden/guangzhou/waterBalancePlan/waterBalancePlan.js.map
	web4/sourcemaps/project/water/pizhou/DispatchBI/DispatchBI.js.map
	web4/sourcemaps/project/water/zhanhua/WaterWorksBI/WaterWorksBI.js.map
	web4/version.js
Please commit your changes or stash them before you merge.
error: The following untracked working tree files would be overwritten by merge:
	civ_energy/css/app.689ec736.css
	civ_energy/css/app.689ec736.css.gz
	civ_energy/js/app.b36b1b39.js
	civ_energy/js/app.b36b1b39.js.LICENSE.txt
	civ_energy/js/app.b36b1b39.js.gz
	civ_iot/css/app.217e906e.css
	civ_iot/css/app.217e906e.css.gz
	civ_iot/js/app.48799b7f.js
	civ_iot/js/app.48799b7f.js.gz
	civ_pandawork/css/app.d5317e9b.css
	civ_pandawork/css/app.d5317e9b.css.gz
	civ_pandawork/css/vendor-node_modules_animate_css_animate_css-node_modules_form-render_es_atom_css-node_modules-05503e.612ba82e.css
	civ_pandawork/css/vendor-node_modules_animate_css_animate_css-node_modules_form-render_es_atom_css-node_modules-05503e.612ba82e.css.gz
	civ_pandawork/js/app.ff0b1827.js
	civ_pandawork/js/app.ff0b1827.js.LICENSE.txt
	civ_pandawork/js/app.ff0b1827.js.gz
	civ_pandawork/js/npm.parseForm.4ac23d71.js
	civ_pandawork/js/npm.parseForm.4ac23d71.js.LICENSE.txt
	civ_pandawork/js/npm.parseForm.4ac23d71.js.gz
	civ_pandawork/js/runtime.a2f53c39.js
	civmanage/static/main.69354b94.js
	civmanage/static/main.69354b94.js.LICENSE.txt
	civmanage/static/main.69354b94.js.gz
	civmanage/static/main.9fc71e80.js
	civmanage/static/main.9fc71e80.js.LICENSE.txt
	civmanage/static/main.9fc71e80.js.gz
	web4/assets/images/login/万州/1.png
	web4/assets/images/login/万州/2.png
	web4/assets/images/login/万州/3.png
	web4/assets/images/login/万州/4.png
	web4/assets/images/login/万州/5.png
	web4/framework/application/login/项目 - 万州.html
	web4/project/garden/guangzhou/waterBalanceFollow/DetailsIndex.html
	web4/project/garden/guangzhou/waterBalanceFollow/edit.js
	web4/project/garden/guangzhou/waterBalanceFollow/tableTemplate.html
	web4/project/garden/guangzhou/waterBalanceFollow/waterBalanceFollow.html
	web4/project/garden/guangzhou/waterBalanceFollow/waterBalanceFollow.js
	web4/sourcemaps/project/garden/guangzhou/waterBalanceFollow/edit.js.map
	web4/sourcemaps/project/garden/guangzhou/waterBalanceFollow/waterBalanceFollow.js.map
Please move or remove them before you merge.
Aborting
fatal: Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff ea7955eae303604b3438fe504750f30548dcaf62
output, run
$ git reset --hard
to recover.
section_end:1661248416:step_script
section_start:1661248416:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1661248417:cleanup_file_variables
ERROR: Job failed: exit status 1