diff options
Diffstat (limited to 'lib/gitlab/conflict/file.rb')
-rw-r--r-- | lib/gitlab/conflict/file.rb | 4 |
1 files changed, 2 insertions, 2 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}" |