[fix] Don't skip PCSes already in conflicts, fix #65

ASSERT-KTH · Mar 16, 2020 · 6c3b710 · 6c3b710
1 parent e53ea29
commit 6c3b710
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/main/java/se/kth/spork/base3dm/TdmMerge.java b/src/main/java/se/kth/spork/base3dm/TdmMerge.java
@@ -30,8 +30,6 @@ public static <T extends ListNode,V> void resolveRawMerge(TStar<T,V> base, TStar
         for (Pcs<T> pcs : delta.getStar()) {
             if (!delta.contains(pcs)) // was removed as otherPcs
                 continue;
-            if (delta.inStructuralConflict(pcs)) // was registered in conflict as otherPcs
-                continue;
 
             if (!pcs.getPredecessor().isListEdge()) {
                 Set<Content<T,V>> contents = delta.getContent(pcs.getPredecessor());