Issue merging a branch: An error occurred while merging. Try again.

Summary

An user created an MR, got approvals, Ci passing. The merge doesn't work however.

Steps to reproduce

eclipse/oniro-core/oniro!329 (merged) When trying to merge we're getting: 'An error occurred while merging. Try again.'

What is the current bug behavior?

'An error occurred while merging. Try again.'

What is the expected correct behavior?

Should merge or report an error allowing to fix the issue

Relevant logs and/or screenshots

the link above

Impact

Blocking a developer from contributing

assigned to @malowe

added ECA ~16083 labels

added statetodo team:webdev labels

mentioned in issue #2051 (closed)

@mrybczyn I took a look at the repository settings for eclipse/oniro-core/oniro and saw that the following setting was enabled:

Check whether the commit author is a GitLab user Restrict commits to existing GitLab users.

This is known to throw the error that you see. I've disabled it. Can you try now to see if you can merge?

Sorry for posting the same comment on 3 PR but wanted to capture the change I did.

Launched this MR in the merge train again. The verdict in 1h :)

The problem with this commit is that the committer email is set to an email that doesn't match ECA records. It looks to be the users personal/previous email address ghassanebb@gmail.com. I checked this by checking out the commit and running git show -s --format='%ce' to see the committer email address, which is how our script does it as well.

@malowe We are currently enforcing that a committer email has a valid ECA on file? I think we only need to validate the author field.

Can you please create an issue and confirm the requirements with @wbeaton. If we can remove this requirement, we might be able to avoid unnecessary ECA validation errors.

Issue created eclipsefdn/it/api/git-eca-rest-api#85 (closed)

mentioned in issue eclipsefdn/it/api/git-eca-rest-api#85 (closed)

Closing this issue as this has since been resolved.

closed