From e743365b50464d4dbf7ac9df24f7bc417f4a8571 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Tue, 18 Aug 2026 14:48:12 -0700
Subject: [PATCH] Copilot's order_by comment

---
 src/documents/bulk_edit.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/documents/bulk_edit.py b/src/documents/bulk_edit.py
index c851c3e01..a6a310632 100644
--- a/src/documents/bulk_edit.py
+++ b/src/documents/bulk_edit.py
@@ -626,8 +626,10 @@ def merge_as_versions(
 ) -> Literal["OK"]:
     with transaction.atomic():
         documents = list(
+            # Ordered by pk so concurrent merges take the row locks in the same order
             Document.objects.select_for_update()
             .filter(id__in=doc_ids)
+            .order_by("id")
             .defer("content"),
         )
         documents_by_id = {document.id: document for document in documents}