Class: Archimate::Diff::Conflicts::PathConflict

Inherits:
BaseConflict
  • Object
show all
Defined in:
lib/archimate/diff/conflicts/path_conflict.rb

Instance Method Summary collapse

Methods inherited from BaseConflict

#conflicts, #diff_combinations, #diff_iterations, #filter1, #filter2

Constructor Details

#initialize(base_local_diffs, base_remote_diffs) ⇒ PathConflict

Returns a new instance of PathConflict.



6
7
8
9
 
# File 'lib/archimate/diff/conflicts/path_conflict.rb', line 6

def initialize(base_local_diffs, base_remote_diffs)
  super
  @associative = true
end

Instance Method Details

#describe ⇒ Object 



11
12
13
 
# File 'lib/archimate/diff/conflicts/path_conflict.rb', line 11

def describe
  "Checking for Differences in one change set that conflict with changes in other change set at the same path"
end

#diff_conflicts(diff1, diff2) ⇒ Object 



15
16
17
 
# File 'lib/archimate/diff/conflicts/path_conflict.rb', line 15

def diff_conflicts(diff1, diff2)
  same_path_but_diff(diff1, diff2) && in_conflict?(diff1, diff2)
end