Your branch is up to date with 'origin/map'.


It took 2.00 seconds to enumerate untracked files. 'status -uno'
may speed it up, but you have to be careful not to forget to add
new files yourself (see 'git help status').
nothing to commit, working tree clean
section_end:1648554097:step_script
section_start:1648554097:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1648554101:cleanup_file_variables
ERROR: Job failed: exit status 1

From https://g.civnet.cn:8443/ReactWeb5/CivWeb
 * branch            master     -> FETCH_HEAD
Updating d044838..11406de
error: Your local changes to the following files would be overwritten by merge:
	package.json
Please commit your changes or stash them before you merge.
Aborting
section_end:1648554061:step_script
section_start:1648554061:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1648554064:cleanup_file_variables
ERROR: Job failed: exit status 1

From https://g.civnet.cn:8443/ReactWeb5/CivWeb
 * branch            master     -> FETCH_HEAD
Updating d044838..11406de
error: Your local changes to the following files would be overwritten by merge:
	package.json
Please commit your changes or stash them before you merge.
Aborting
section_end:1648554039:step_script
section_start:1648554039:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1648554043:cleanup_file_variables
ERROR: Job failed: exit status 1