From 91a704aa0172612e08c6b94e3a9ae64231c53756 Mon Sep 17 00:00:00 2001
From: BertKoor <Bert.Koorengevel@ordina.nl>
Date: Fri, 20 Mar 2026 09:17:06 +0100
Subject: [PATCH] fix #5340: before merging gather only xrefs of changes with
 status pending on originating tree

---
 app/Services/AdminService.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Services/AdminService.php b/app/Services/AdminService.php
index 31c372e2d1..cf3b2aac78 100644
--- a/app/Services/AdminService.php
+++ b/app/Services/AdminService.php
@@ -64,6 +64,7 @@ public function countCommonXrefs(Tree $tree1, Tree $tree2): int
     {
         $subquery1 = DB::table('change')
             ->where('gedcom_id', '=', $tree1->id())
+            ->where('status', '=', 'pending')
             ->select(['xref AS xref1'])
             ->union(DB::table('individuals')
                 ->where('i_file', '=', $tree1->id())