BUGFIX: No conflicts are shown

Regression from 36a5de7 as the deduplication did not work.
neos · Nov 9, 2024 · 829645a · 829645a
1 parent 9175b0e
commit 829645a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
@@ -76,9 +76,9 @@ public function fromWorkspaceRebaseFailed(
         /** @var array<string,Conflict> */
         $conflictsByKey = [];
 
-        foreach ($workspaceRebaseFailed->conflictingEvents as $eventThatFailedDuringRebase) {
-            $conflict = $this->createConflictFromEventThatFailedDuringRebase($eventThatFailedDuringRebase);
-            if (array_key_exists($conflict->key, $conflictsByKey)) {
+        foreach ($workspaceRebaseFailed->conflictingEvents as $conflictingEvent) {
+            $conflict = $this->createConflict($conflictingEvent);
+            if (!array_key_exists($conflict->key, $conflictsByKey)) {
                 // deduplicate if the conflict affects the same node
                 $conflictsByKey[$conflict->key] = $conflict;
             }