Show tooltip when conflicts cannot be resolved through GitLab

app/views/projects/merge_requests/widget/open/_conflicts.html.haml

@@ -7,7 +7,13 @@
   - if @merge_request.conflicts_can_be_resolved_by?(current_user)
     - if @merge_request.conflicts_can_be_resolved_in_ui?
       = link_to "resolve these conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request)
-      or
+    - else
+      %span.has-tooltip{title: "These conflicts cannot be resolved through GitLab"}
+        resolve these conflicts locally
+  - else
+    resolve these conflicts
+
+  or
 
   - if @merge_request.can_be_merged_via_command_line_by?(current_user)
     #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.