Skip to content

G
gitlab-ce
Commit 97ceadee authored by Sean McGivern's avatar Sean McGivern Committed by Fatih Acet
Browse files
Options

Fix MR conflict resolution commits

parent 7af277f6
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
lib/gitlab/conflict/file_collection.rb
View file @ 97ceadee
...@@ -33,7 +33,7 @@ module Gitlab ...@@ -33,7 +33,7 @@ module Gitlab
committer: committer, committer: committer,
tree: new_tree, tree: new_tree,
message: commit_message, 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) update_ref: Gitlab::Git::BRANCH_REF_PREFIX + merge_request.source_branch)
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7