When merging two branches fail in the UI(rebase strategy), currently no proper error is shown. In the backend, it throws this error:

A merge conflict occurred during the rebase. Please resolve the conflicts and try again

It would be good to have this message shown to users to understand the root cause/reason for the failure.