blob: 06ab0a3fa0020f20ab8e7fbd796ae8e12f9d6ffc (
plain)
1
2
3
4
5
6
7
8
9
10
|
%h4.has-conflicts
= icon("exclamation-triangle")
This merge request contains merge conflicts
%p
Please resolve these conflicts or
- if @merge_request.can_be_merged_by?(current_user)
#{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
- else
ask someone with write access to this repository to merge this request manually.
|
