diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index 695dafa9e20..46e381d2661 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -33,7 +33,7 @@ module Gitlab committer: committer, tree: new_tree, message: commit_message, - parents: [our_commit, their_commit], + parents: [our_commit, their_commit].map(&:oid), update_ref: Gitlab::Git::BRANCH_REF_PREFIX + merge_request.source_branch) end |