Find a way to avoid conflicts on the last line of views

Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.

• Close this issue

For instance I got this conflict in app/views/projects/merge_requests/widget/_open.html.haml:

        = succeed '.' do
          != markdown issues_sentence(mr_closes_issues), pipeline: :gfm, author: @merge_request.author
<<<<<<< HEAD

  - if @merge_request.approvals.any?
    .mr-widget-footer.approved-by-users
      Approved by
      - @merge_request.approved_by_users.each do |user|
        = link_to_member(@project, user, name: false, size: 24)
=======
        = mr_assign_issues_link
>>>>>>> ce/8-13-stable

which was resolved as follows:

        = succeed '.' do
          != markdown issues_sentence(mr_closes_issues), pipeline: :gfm, author: @merge_request.author
        = mr_assign_issues_link

  - if @merge_request.approvals.any?
    .mr-widget-footer.approved-by-users
      Approved by
      - @merge_request.approved_by_users.each do |user|
        = link_to_member(@project, user, name: false, size: 24)

The conflict arise because in the CE version = mr_assign_issues_link was on the last line but in the EE version there was more lines after it.