Pipeline · ReactWeb5 / CivManage

test: test file

7 jobs from master

Status	Job ID	Name
Checkout
passed	#320071 civ_manage_128 allowed to fail manual	checkout	00:31 Sep 03, 2024

Install
passed	#320077 civ_manage_128 allowed to fail manual	install	12:32 Sep 03, 2024
failed	#320076 civ_manage_128 allowed to fail manual	install	00:21 Sep 03, 2024
failed	#320072 civ_manage_128 allowed to fail manual	install	01:30 Sep 03, 2024

Package
failed	#320073 civ_manage_128 manual	package	00:05 Sep 03, 2024

Push
skipped	#320074 civ_manage_128	push_2021
skipped	#320075 civ_manage_128	push_solution

Name Stage Failure

	Name	Stage	Failure
failed	package	Package
	`From https://g.civnet.cn:8443/ReactWeb5/maintenance * branch master -> FETCH_HEAD Updating fb61f166..521355c6 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:1725364030:step_script section_start:1725364030:cleanup_file_variables Cleaning up project directory and file based variables section_end:1725364030:cleanup_file_variables ERROR: Job failed: exit status 1`

failed

package

Package

From https://g.civnet.cn:8443/ReactWeb5/maintenance
 * branch              master     -> FETCH_HEAD
Updating fb61f166..521355c6
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:1725364030:step_script
section_start:1725364030:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1725364030:cleanup_file_variables
ERROR: Job failed: exit status 1