Method: Object#stroke_merge

Defined in:
lib/strokedb/sync/diff/default.rb

#stroke_merge(patch1, patch2) ⇒ Object

> is_conflict, result1, result2



9
10
11
12
13
 
# File 'lib/strokedb/sync/diff/default.rb', line 9

def stroke_merge(patch1, patch2) # => is_conflict, result1, result2
  r1 = self.stroke_patch(patch1)
  r2 = self.stroke_patch(patch2)
  [r1 != r2, r1, r2]
end