From 2b367d7ec14e9463ae51f17dc908bf1c949bd8a7 Mon Sep 17 00:00:00 2001 From: tobias Date: Mon, 3 Aug 2026 09:02:51 +0200 Subject: [PATCH] vault backup: 2026-08-03 09:02:51 --- .obsidian/plugins/obsidian-git/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json index 2f4f09c..4b4020c 100644 --- a/.obsidian/plugins/obsidian-git/data.json +++ b/.obsidian/plugins/obsidian-git/data.json @@ -17,7 +17,7 @@ "showStatusBar": true, "updateSubmodules": false, "syncMethod": "merge", - "mergeStrategy": "none", + "mergeStrategy": "theirs", "customMessageOnAutoBackup": false, "autoBackupAfterFileChange": false, "treeStructure": false,