Unexpected error: error: could not apply ac0619cdcda... Automated addition hvq_slc7_amd64_gcc10_CMSSW_12_3_1 hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort".