Method: Eternity::ConflictResolver#resolve

Defined in:
lib/eternity/conflict_resolver.rb

#resolve ⇒ Object 



14
15
16
17
18
 
# File 'lib/eternity/conflict_resolver.rb', line 14

def resolve
  current_diff = diff current, base
  target_diff = diff target, base
  merge(target_diff, target, merge(current_diff, current, base))
end