Pipeline · ReactWeb5 / CivManage

xform更新

5 jobs from master

Status	Job ID	Name
Checkout
passed	#327200 civ_manage_128 allowed to fail manual	checkout	02:18 Nov 26, 2024

Install
passed	#327201 civ_manage_128 allowed to fail manual	install	29:59 Nov 26, 2024

Package
failed	#327202 civ_manage_128 manual	package	00:05 Nov 26, 2024

Push
skipped	#327203 civ_manage_128	push_2021
skipped	#327204 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 9ad411a9..a0dd1929 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:1732592444:step_script section_start:1732592444:cleanup_file_variables Cleaning up project directory and file based variables section_end:1732592445: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 9ad411a9..a0dd1929
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:1732592444:step_script
section_start:1732592444:cleanup_file_variables
Cleaning up project directory and file based variables
section_end:1732592445:cleanup_file_variables
ERROR: Job failed: exit status 1