From https://g.civnet.cn:8443/ReactWeb5/CivWeb * branch master -> FETCH_HEAD Updating af49b4e..a5ec96a error: Your local changes to the following files would be overwritten by merge: package-lock.json Please commit your changes or stash them before you merge. Aborting
section_end:1647915086:step_script
section_start:1647915086:cleanup_file_variables
Cleaning up project directory and file based variables