Could not automatically backport #3023

[github-actions[bot]]

Exception occurred when trying to cherry-pick PR #3023. 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', 'ba1a0dd89295be0c0b91b4a00a00b5e98e54745d']' returned non-zero exit status 128.

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: commit ba1a0dd89295be0c0b91b4a00a00b5e98e54745d is a merge but no -m option was given.
fatal: cherry-pick failed

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.

[chambm]

Grumble. It seems having a merge commit in the mix (or perhaps as the last commit) messes up the cherry pick process.