"Resolve conflict" button unavailable for Developer role.

Summary

After MR creation from unprotected branch to protected branch (only Master role allowed to merge and push) Developer role users can't resolve conflicts via UI button, but locally merge is allowed.

Steps to reproduce

  1. Protect some branch (only Master role allowed to merge and push)
  2. Create MR (with some conflicts) from unprotected branch to protected branch
  3. As Developer role user try to resolve via UI

What is the current bug behavior?

  1. There is no button "Resolve conflicts" for Developer role users

What is the expected correct behavior?

  1. There is "resolve conflicts" button available for Developer role users

Relevant logs and/or screenshots

Settings:

  1. developer_role_settings - Developer role allowed to merge
  2. no_developer_role_settings - Developer role not allowed to merge

MR (from developer role user perspective):

  1. developer_role_MR - Developer role allowed to merge
  2. no_developer_role_MR - Developer role not allowed to merge