Hi @davidhsingyuchen. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

It seems reasonable to add in case someone gets stuck and doesn't know where to look for help on the error. But, you need to sign the commit for this change to get a successful CI run :)

It seems reasonable to add in case someone gets stuck and doesn't know where to look for help on the error. But, you need to sign the commit for this change to get a successful CI run :)

Thanks for the reminder! Fixed.

Have we run into problems with this? I think most of our cherry-picks are not merge commits (generally the merge is going to be directly into one of our branches and not something with its own content; I don't think we commonly have PRs that include merges themselves).

Have we run into problems with this?

For the context, I encountered this error when I was working on #8624.

I think most of our cherry-picks are not merge commits

Hmm, I guess I may be misunderstanding something here. Take the commits from yesterday for example, if anyone wants to cherry pick a commit that starts with Merge pull request, then the error would occur?

I feel like we should encourage not cp'ing merge commits. If you wanted all of the work from a particular PR/set of PRs, we should direct folks to cp all of the individual commits from that PR/set of PRs.

For some examples:

1. [release/1.7] Backport Sandbox/CRI fixes #8282
2. [release/1.7] Backport CRI sandbox server stats changes #8604
3. [release/1.7] Transfer service backports #8491

I'd agree with @dcantah, generally we'd want the individual commits that comprise a feature/bugfix/PR cherry-picked rather than the merge commit.

@dcantah @samuelkarp Thank you for the pointer. Created #8627 to replace this one.