GoBoundless / dyph

A library of useful diffing algorithms for Ruby
https://www.boundless.com/
MIT License
8 stars 2 forks source link

RFR: refactor merge results into something clearer #41

Closed aamontal closed 8 years ago

aamontal commented 8 years ago

Wrap the output of the differ in a MergeResult class, either Success or Conflict.

The MergeResult class is responsible for applying the join or conflict functions.

There are 3 output representations: