%hr
.form-horizontal.resolve-conflicts-form
  .form-group
    .col-md-4
      %h4 Resolve conflicts on source branch
      .resolve-info
        Resolve the merge conflict by choosing
        %code Use ours
        or
        %code Use theirs
        in all the conflicted files above. Commit these changes into
        %strong {{conflictsData.sourceBranch}}.
    .col-md-8
      %label.label-light{ "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
    .col-md-offset-4.col-md-8
      .row
        .col-xs-6
          %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
            %span {{commitButtonText}}
        .col-xs-6.text-right
          = link_to "Cancel", project_merge_request_path(@merge_request.project, @merge_request), class: "btn btn-cancel"

%hr
.form-horizontal.resolve-conflicts-form
  .form-group
    .col-md-4
      %h4 Resolve conflicts on source branch
      .resolve-info
        Resolve the merge conflict by choosing
        %code Use ours
        or
        %code Use theirs
        in all the conflicted files above. Commit these changes into
        #{link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch)}.
    .col-md-8
      %label.label-light{ "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
    .col-md-offset-4.col-md-8
      .row
        .col-xs-6
          %button.btn.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
            %span {{commitButtonText}}
        .col-xs-6.text-right
          = link_to "Cancel", project_merge_request_path(@merge_request.project, @merge_request), class: "btn btn-cancel"

Make source branch a link
Make source branch a link
