Find a way to prevent conflicts in controllers' before_action

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/controllers/projects/merge_requests_controller.rb:

  before_action :merge_request, only: [
    :edit, :update, :show, :diffs, :commits, :conflicts, :builds, :pipelines, :merge, :merge_check,
<<<<<<< HEAD
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
    :approve, :rebase
=======
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues
>>>>>>> ce/8-13-stable
  ]

which was fixed as follow:

  before_action :merge_request, only: [
    :edit, :update, :show, :diffs, :commits, :conflicts, :builds, :pipelines, :merge, :merge_check,
    :ci_status, :toggle_subscription, :cancel_merge_when_build_succeeds, :remove_wip, :resolve_conflicts, :assign_related_issues,
    :approve, :rebase
  ]

Ideally, there shouldn't be any conflict here.