Module: Dyph::Support::Collater

Extended by:
Collater
Included in:
Collater
Defined in:
lib/dyph/support/collater.rb

Instance Method Summary collapse

Instance Method Details

#collate_merge(merge_result, join_function, conflict_handler) ⇒ Object 



5
6
7
8
9
10
11
12
13
14
15
16
 
# File 'lib/dyph/support/collater.rb', line 5

def collate_merge(merge_result, join_function, conflict_handler)
  if merge_result.empty?
    Dyph::MergeResult.new([Outcome::Resolved.new([])], join_function)
  else
    merge_result = combine_non_conflicts(merge_result)
    if (merge_result.length == 1 && merge_result.first.resolved?)
      Dyph::MergeResult.new(merge_result, join_function)
    else
      Dyph::MergeResult.new(merge_result, join_function, conflict: true, conflict_handler: conflict_handler)
    end
  end
end