gitlab merge request bug
severity1 ~bug my gitlab version is 13.12.1 . when I merge request have conflicts ,and resolve it in gitlab web, then it dont continue. that like an bug . example:

severity1 ~bug my gitlab version is 13.12.1 . when I merge request have conflicts ,and resolve it in gitlab web, then it dont continue. that like an bug . example:
