diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/conflict/file.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/conflict/file_collection.rb | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 7f10b8ea8fd..b6fa9402d46 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -44,9 +44,9 @@ module Gitlab section_id ||= line_code(line) case resolution[section_id] - when 'ours' + when 'head' next unless line.type == 'new' - when 'theirs' + when 'origin' next unless line.type == 'old' else raise MissingResolution, "Missing resolution for section ID: #{section_id}" diff --git a/lib/gitlab/conflict/file_collection.rb b/lib/gitlab/conflict/file_collection.rb index da9994a7405..5df54fd8677 100644 --- a/lib/gitlab/conflict/file_collection.rb +++ b/lib/gitlab/conflict/file_collection.rb @@ -20,10 +20,11 @@ module Gitlab @merge_index ||= repository.rugged.merge_commits(our_commit, their_commit) end - def resolve_conflicts!(resolutions, commit_message, user:) + def resolve_conflicts!(params, user:) + resolutions = params[:sections] + commit_message = params[:commit_message] || default_commit_message rugged = repository.rugged committer = repository.user_to_committer(user) - commit_message ||= default_commit_message files.each do |file| file.resolve!(resolutions, index: merge_index, rugged: rugged) |