Merge failing after affiliation change

Summary

My commits can't be merged after the affiliation change

Steps to reproduce

Create a new commit like eclipse/oniro-core/oniro!342 (merged) with the changed email address (both Author and Signed-off-by) Get review, try to merge -> fail

What is the current bug behavior?

'An error occurred while merging. Try again.'

What is the expected correct behavior?

The merge should succeed

Relevant logs and/or screenshots

eclipse/oniro-core/oniro!342 (merged)

Impact

Blocking my contributions until solved