From 829645a1555bcbf85e33a4cf23239d8fac9fa655 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sat, 9 Nov 2024 19:28:01 +0100
Subject: [PATCH] BUGFIX: No conflicts are shown

Regression from 36a5de71e2f1d9da88d64bb8ede316bcd47083fe as the deduplication did not work.
---
 .../Infrastructure/ContentRepository/ConflictsFactory.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
index 013215e7c1..c78e75c603 100644
--- 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;
             }