Exception occurred when trying to cherry-pick PR #3113.
Please cherry-pick it manually.
Traceback (most recent call last):
File "/action/helpers.py", line 17, in git
command_run = subprocess.run(["git", *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=True)
File "/usr/local/lib/python3.8/subprocess.py", line 516, in run
raise CalledProcessError(retcode, process.args,
subprocess.CalledProcessError: Command '['git', 'cherry-pick', '450262087be67060ca26687aee5685a5c2449ee8']' returned non-zero exit status 1.
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/action/main.py", line 30, in backport_commits
git("cherry-pick", commit_hash)
File "/action/helpers.py", line 26, in git
raise GitException(output)
helpers.GitException: error: could not apply 450262087... - fixed MSFragger search to set default data_type correctly depending on workflow type (PRM -> data_type=1, DDA -> data_type=0; and user can override the data_type in Additional Settings)
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".
hint: Disable this message with "git config advice.mergeConflict false"
During handling of the above exception, another exception occurred:
Traceback (most recent call last):
File "/action/main.py", line 72, in <module>
entrypoint(
File "/action/main.py", line 48, in entrypoint
new_branch = backport_commits(commits_to_backport, base_branch, pr_branch)
File "/action/main.py", line 33, in backport_commits
raise RuntimeError("Could not cherry pick at least one commit automatically.")
RuntimeError: Could not cherry pick at least one commit automatically.
Exception occurred when trying to cherry-pick PR #3113. Please cherry-pick it manually.