That didn't work. Did you do the git rebase HEAD^^ --onto maintenance/1.18.x bit from the new branch? You should be able to undo whatever you did.

Yes, I did. But I choose the wrong target branch when creating the PR (maintenance1.8.x). Doesn't it work by changing it to 1.18.x?

It just snipped off the last two commits and applied them to the HEAD of the maintenance/1.18.x. When you made the PR and used 1.8.x it applied everything from there up to the HEAD of 1.18.x plus your two commits. I've made that error myself, if you catch it before hitting PR button you can change the base branch again to get it where it belongs.

I think the azure failures are because we need #16308.

EDIT: Keeping old branches working can be a chore :(

I'll make a PR for that and see if it fixes the branch. See #16441.

Thanks for your answer. But I still feel a little confused. I actually mean I choose the wrong branch on the Github (the branch for the PR to be merged in), but my own branch is still based on maintenance/1.18.x (the correct one). So then I just switched the Github branch to 1.18.x. It should work anyway, right? Otherwise this PR cannot pass conflicts check.

@Qiyu8 Please remove the tags, and add back the old ones, this is an active PR.

@suquark yes, it is OK now. Originally it had changes for more than 1000 files.

@suquark sorry for the misleading label, It's not common to see non-master PR, Hope that #16441 solves CI failure.

Close/open to restart tests.

Thanks @suquark .

Discussing a patch release with this change in issue ( #16483 ).