From 6ee72a531f13ad5b6a18058758c4bb50f0bd96cd Mon Sep 17 00:00:00 2001
From: Brett Saviano <bsaviano@intersystems.com>
Date: Tue, 16 Jun 2026 18:25:53 -0400
Subject: [PATCH] Always overwrite entire class for `Pull Server Changes` when
 there's a conflict between the local copy and server copy

---
 src/commands/compile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commands/compile.ts b/src/commands/compile.ts
index 285a284e..a66bacf3 100644
--- a/src/commands/compile.ts
+++ b/src/commands/compile.ts
@@ -186,7 +186,7 @@ What do you want to do?`,
           // Overwrite
           return importFile(file, willCompile, true, true);
         case "Pull Server Changes":
-          loadChanges([file]);
+          loadChanges([file], true);
           return Promise.reject();
         case "Cancel":
           return Promise.reject();