<commit_before>- page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"

= render "projects/merge_requests/show/mr_title"

.merge-request-details.issuable-details
  = render "projects/merge_requests/show/mr_box"

= render 'shared/issuable/sidebar', issuable: @merge_request

#conflicts{"v-cloak" => "true"}
  .loading{"v-if" => "isLoading"}
    %i.fa.fa-spinner.fa-spin

  .content-block.oneline-block{"v-if" => "hasError"}
    %p {{conflictsData.errorMessage}}

  .content-block.oneline-block.files-changed{"v-if" => "!isLoading && !hasError"}
    .inline-parallel-buttons
      .btn-group
        %a.btn{ |
          ":class" => "{'active': !isParallel}", |
          "@click" => "handleViewTypeChange('inline')"}
          Inline
        %a.btn{ |
          ":class" => "{'active': isParallel}", |
          "@click" => "handleViewTypeChange('parallel')"}
          Side-by-side

    .js-toggle-container
      .commit-stat-summary
        Showing
        %strong.cred {{conflictsCount}} conflicts
        for
        %strong {{conflictsData.source_branch}}
        into
        %strong {{conflictsData.target_branch}}

  .files-wrapper{"v-if" => "!isLoading && !hasError"}
    .files{"v-if" => "isParallel"}
      .diff-file.file-holder.conflict.parallel-view{"v-for" => "file in conflictsData.files"}
        .file-title
          %i.fa.fa-fw.fa{":class" => "file.iconClass"}
          %strong {{file.filePath}}
          .file-actions
            %a.btn.view-file.btn-file-option{":href" => "file.blobPath"}
              View file @{{conflictsData.shortCommitSha}}
        .diff-content.diff-wrap-lines
          .diff-wrap-lines.code.file-content.js-syntax-highlight.white
            %table
              %tr.line_holder.parallel{"v-for" => "section in file.parallelLines"}
                %template{"v-for" => "line in section"}

                  %template{"v-if" => "line.isHeader"}
                    %td.diff-line-num.header{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected}"}
                    %td.line_content.header{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected}"}
                      %strong {{line.richText}}
                      %button.btn{"@click" => "handleSelected(line.id, line.section)"} Use this

                  %template{"v-if" => "!line.isHeader"}
                    %td.diff-line-num.old_line{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'match': line.hasMatch, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected }"}
                      {{line.lineNumber}}
                    %td.line_content.parallel{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'match': line.hasMatch, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected }"}
                      {{{line.richText}}}

    .files{"v-if" => "!isParallel"}
      .diff-file.file-holder.conflict.inline-view{"v-for" => "file in conflictsData.files"}
        .file-title
          %i.fa.fa-fw{":class" => "file.iconClass"}
          %strong {{file.filePath}}<commit_msg>Prefer v-show instead of v-if.<commit_after>- page_title "Merge Conflicts", "#{@merge_request.title} (#{@merge_request.to_reference}", "Merge Requests"

= render "projects/merge_requests/show/mr_title"

.merge-request-details.issuable-details
  = render "projects/merge_requests/show/mr_box"

= render 'shared/issuable/sidebar', issuable: @merge_request

#conflicts{"v-cloak" => "true"}
  .loading{"v-if" => "isLoading"}
    %i.fa.fa-spinner.fa-spin

  .content-block.oneline-block{"v-if" => "hasError"}
    %p {{conflictsData.errorMessage}}

  .content-block.oneline-block.files-changed{"v-if" => "!isLoading && !hasError"}
    .inline-parallel-buttons
      .btn-group
        %a.btn{ |
          ":class" => "{'active': !isParallel}", |
          "@click" => "handleViewTypeChange('inline')"}
          Inline
        %a.btn{ |
          ":class" => "{'active': isParallel}", |
          "@click" => "handleViewTypeChange('parallel')"}
          Side-by-side

    .js-toggle-container
      .commit-stat-summary
        Showing
        %strong.cred {{conflictsCount}} conflicts
        for
        %strong {{conflictsData.source_branch}}
        into
        %strong {{conflictsData.target_branch}}

  .files-wrapper{"v-if" => "!isLoading && !hasError"}
    .files{"v-show" => "isParallel"}
      .diff-file.file-holder.conflict.parallel-view{"v-for" => "file in conflictsData.files"}
        .file-title
          %i.fa.fa-fw.fa{":class" => "file.iconClass"}
          %strong {{file.filePath}}
          .file-actions
            %a.btn.view-file.btn-file-option{":href" => "file.blobPath"}
              View file @{{conflictsData.shortCommitSha}}
        .diff-content.diff-wrap-lines
          .diff-wrap-lines.code.file-content.js-syntax-highlight.white
            %table
              %tr.line_holder.parallel{"v-for" => "section in file.parallelLines"}
                %template{"v-for" => "line in section"}

                  %template{"v-if" => "line.isHeader"}
                    %td.diff-line-num.header{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected}"}
                    %td.line_content.header{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected}"}
                      %strong {{line.richText}}
                      %button.btn{"@click" => "handleSelected(line.id, line.section)"} Use this

                  %template{"v-if" => "!line.isHeader"}
                    %td.diff-line-num.old_line{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'match': line.hasMatch, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected }"}
                      {{line.lineNumber}}
                    %td.line_content.parallel{":class" => "{ |
                      'head': line.isHead, |
                      'origin': line.isOrigin, |
                      'match': line.hasMatch, |
                      'selected': line.isSelected, |
                      'unselected': line.isUnselected }"}
                      {{{line.richText}}}

    .files{"v-show" => "!isParallel"}
      .diff-file.file-holder.conflict.inline-view{"v-for" => "file in conflictsData.files"}
        .file-title
          %i.fa.fa-fw{":class" => "file.iconClass"}
          %strong {{file.filePath}}
{'fraction_non_alphanumeric': 0.16573149035171753, 'fraction_numerical': 0.0, 'mean_word_length': 1.7619047619047619, 'pattern_counts': {'":': 18, '<': 3, '<?xml version=': 0, '>': 53, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '672127', 'n_tokens_mistral': 2218, 'n_tokens_neox': 2137, 'n_words': 307}