blob: 27cafd2d7d9fd492d36621f453ece55b916449e9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
|
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
|