25 lines
1.3 KiB
Plaintext
25 lines
1.3 KiB
Plaintext
- branch_name = link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"
|
|
- translation =_('You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}') % { use_ours: '<code>Use Ours</code>', use_theirs: '<code>Use Theirs</code>', branch_name: branch_name }
|
|
|
|
%hr
|
|
.resolve-conflicts-form
|
|
.form-group.row
|
|
.col-md-4
|
|
%h4= _('Resolve conflicts on source branch')
|
|
.resolve-info
|
|
= translation.html_safe
|
|
.col-md-8
|
|
%label.label-bold{ "for" => "commit-message" }
|
|
#{ _('Commit message') }
|
|
.commit-message-container
|
|
.max-width-marker
|
|
%textarea.form-control.js-commit-message#commit-message{ "v-model" => "conflictsData.commitMessage", "rows" => "5" }
|
|
.form-group.row
|
|
.offset-md-4.col-md-8
|
|
.row
|
|
.col-6
|
|
%button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
|
|
%span {{commitButtonText}}
|
|
.col-6.text-right
|
|
= link_to "Cancel", project_merge_request_path(@merge_request.project, @merge_request), class: "btn btn-cancel"
|