Conflicts detected during merge even though there are no conflicts
This merge request can't be merge due to the following error:
Even though there are no conflicts locally.
The merge request is mergeable in the database (mr.mergeable?
is true) and widget.json
returns mergeable: true
as well.
However, merge_error
returned from the server is non-empty: