From b61c08041ef1b735ebeb5eef9998b548bb7c8ee1 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 12 Jan 2025 11:36:45 +0000
Subject: [PATCH] Enable merging

---
 plugin/src/file-operations/obsidian-file-operations.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/src/file-operations/obsidian-file-operations.ts b/plugin/src/file-operations/obsidian-file-operations.ts
index 41a2df00..95dcdd01 100644
--- a/plugin/src/file-operations/obsidian-file-operations.ts
+++ b/plugin/src/file-operations/obsidian-file-operations.ts
@@ -69,7 +69,7 @@ export class ObsidianFileOperations implements FileOperations {
 			return new Uint8Array(0);
 		}
 
-		if (isFileTypeMergable(path)) {
+		if (!isFileTypeMergable(path)) {
 			Logger.getInstance().debug(
 				`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
 			);