Eclipse ICE - Unable to merge commits between gitlab branches
Summary
I'm trying to merge commits from an old branch (next) on our Gitlab repository (https://gitlab.eclipse.org/eclipse/ice/ice) into a new branch (main). The push fails because the ECA check encounters email addresses that no longer have signed ECAs because the committers (Daniel Bluhm and I) switched jobs and have ECAs signed with different addresses. The full error message is below.
What's the best way to address this? Since the branch we're merging (next) has been sitting for a year and was fully approved last year, can we just disable the hook until the merge to main is complete?
Full error message
Repository https://gitlab.eclipse.org/eclipse/ice/ice
pre-receive hook declined Commit: 4aaddd9cb3aaa494bff4a8cdd999501e83bf6c15 X
Reviewing commit: 4aaddd9cb3aaa494bff4a8cdd999501e83bf6c15 Authored by: Jay Jay Billings billingsjj@ornl.gov Could not find an Eclipse user with mail 'billingsjj@ornl.gov' for author of commit 4aaddd9cb3aaa494bff4a8cdd999501e83bf6c15
Errors: GL-HOOK-ERR: Author must have an Eclipse Account Any warnings or errors noted above may indicate compliance issues with committer ECA requirements. More information may be found on https://www.eclipse.org/legal/ECA.php
Commit: b5f3b4c677d2e92189aa251c67af5a2290573e84 X
Reviewing commit: b5f3b4c677d2e92189aa251c67af5a2290573e84 Authored by: Jay Jay Billings billingsjj@ornl.gov Could not find an Eclipse user with mail 'billingsjj@ornl.gov' for author of commit b5f3b4c677d2e92189aa251c67af5a2290573e84
Errors: GL-HOOK-ERR: Author must have an Eclipse Account Any warnings or errors noted above may indicate compliance issues with committer ECA requirements. More information may be found on https://www.eclipse.org/legal/ECA.php
Commit: 8b361c93a840950be46c04fe7cb18f0381a2a434 X
Reviewing commit: 8b361c93a840950be46c04fe7cb18f0381a2a434 Authored by: Jay Jay Billings billingsjj@ornl.gov Could not find an Eclipse user with mail 'billingsjj@ornl.gov' for author of commit 8b361c93a840950be46c04fe7cb18f0381a2a434
Errors: GL-HOOK-ERR: Author must have an Eclipse Account Any warnings or errors noted above may indicate compliance issues with committer ECA requirements. More information may be found on https://www.eclipse.org/legal/ECA.php