blob: b9f734310be1a6d822eb2b04a99238dbf2316f7c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
|
# frozen_string_literal: true
module MergeRequests
module Conflicts
class ResolveService < MergeRequests::Conflicts::BaseService
def execute(current_user, params)
conflicts = Gitlab::Conflict::FileCollection.new(merge_request)
conflicts.resolve(current_user, params[:commit_message], params[:files])
end
end
end
end
|