gitlab-org--gitlab-foss/app/services/merge_requests/conflicts/resolve_service.rb

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
Fix conflict resolution from corrupted upstream I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way. 2017-05-11 11:23:02 -04:00			`module MergeRequests`
			`module Conflicts`
			`class ResolveService < MergeRequests::Conflicts::BaseService`
			`def execute(current_user, params)`
Refactor conflict resolution to contain git ops within Gitlab::Git This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553 2017-10-06 21:41:23 -04:00			`conflicts = Gitlab::Conflict::FileCollection.new(merge_request)`
Fix conflict resolution from corrupted upstream I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way. 2017-05-11 11:23:02 -04:00
Encapsulate git operations for conflict resolution into lib 2017-10-05 19:22:24 -04:00			`conflicts.resolve(current_user, params[:commit_message], params[:files])`
Fix conflict resolution from corrupted upstream I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way. 2017-05-11 11:23:02 -04:00			`end`
			`end`
			`end`
			`end`