From 02eebc54f7bd237335bfc03d21181aa297032de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20Lars=C3=A9n?= <slarse@kth.se>
Date: Mon, 24 Feb 2020 20:19:13 +0100
Subject: [PATCH] [fix] Skip processing PCS that is already conflicting #21

---
 src/main/java/se/kth/spork/merge/TdmMerge.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/se/kth/spork/merge/TdmMerge.java b/src/main/java/se/kth/spork/merge/TdmMerge.java
index 7a8ddabc..4de40c89 100644
--- 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);