[fix] Skip processing PCS that is already conflicting #21

ASSERT-KTH · Feb 24, 2020 · 02eebc5 · 02eebc5
1 parent ed53b9c
commit 02eebc5
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/se/kth/spork/merge/TdmMerge.java b/src/main/java/se/kth/spork/merge/TdmMerge.java
@@ -32,6 +32,8 @@ public static <T,V> void resolveRawMerge(TStar<T,V> base, TStar<T,V> delta) {
         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() != null) {
                 Set<Content<T,V>> contents = delta.getContent(pcs);