Pipeline · ReactWeb5 / CivWeb

6 jobs from master

Status	Job ID	Name
Refresh
failed	#196361 civ_base allowed to fail manual	refresh	00:05 Sep 30, 2022
failed	#196356 civ_base allowed to fail manual	refresh	00:05 Sep 30, 2022

Install
failed	#196357 civ_base allowed to fail manual	install	00:04 Sep 30, 2022

Package
manual	#196358 civ_base manual	package

Push
created	#196360 civ_base	push2021
created	#196359 civ_base	pushSolution

	Name	Stage
failed	install	Install
	`From https://g.civnet.cn:8443/ReactWeb5/CivWeb * branch master -> FETCH_HEAD Updating 2888199..5915ddb 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:1664503561:step_script section_start:1664503561:cleanup_file_variables Cleaning up project directory and file based variables section_end:1664503561:cleanup_file_variables ERROR: Job failed: exit status 1`
failed	refresh	Refresh
	`From https://g.civnet.cn:8443/ReactWeb5/CivWeb * branch master -> FETCH_HEAD Updating 2888199..5915ddb 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:1664503305:step_script section_start:1664503305:cleanup_file_variables Cleaning up project directory and file based variables section_end:1664503306:cleanup_file_variables ERROR: Job failed: exit status 1`