From b10abad3a33e12dff331832ff2031206be424553 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Sun, 8 Nov 2026 19:12:42 +0100
Subject: [PATCH] Apply suggestion from @ZeldaZach

Co-authored-by: Zach H <zahalpern+github@gmail.com>
---
 cockatrice/src/interface/deck_sync/deck_sync_manager.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp b/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp
index 336e69868..cd51ca505 100644
--- a/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp
+++ b/cockatrice/src/interface/deck_sync/deck_sync_manager.cpp
@@ -666,6 +666,13 @@ void DeckSyncManager::handleConflictDownload(const QString &relativePath, const
         processNext();
         return;
     }
+    if (serverDeck.getContentHash() == localFiles.value(relativePath).hash) {
+        // Same deck, the row just predates hashes: upload once so the server stamps
+        // hash and last_modified instead of asking about identical content.
+        applyUpload(relativePath, ctx.serverPath, ctx.deckId, ctx.guid);
+        processNext();
+        return;
+    }
 
     DeckSyncSidecar sidecar(sidecarPath);
     sidecar.load();