From e00332bbd9d586fac3a471f2d4c135a1dce027d5 Mon Sep 17 00:00:00 2001 From: "Tomoya Matsuura(MacBookPro)" Date: Thu, 18 Apr 2024 22:50:40 +0900 Subject: [PATCH] [obsidian] vault backup: 2024-04-18 22:50:40[ --- content/.obsidian/plugins/obsidian-git/data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/.obsidian/plugins/obsidian-git/data.json b/content/.obsidian/plugins/obsidian-git/data.json index b3d13be4..bc32d31f 100644 --- a/content/.obsidian/plugins/obsidian-git/data.json +++ b/content/.obsidian/plugins/obsidian-git/data.json @@ -12,7 +12,7 @@ "listChangedFilesInMessageBody": false, "showStatusBar": true, "updateSubmodules": true, - "syncMethod": "rebase", + "syncMethod": "merge", "customMessageOnAutoBackup": false, "autoBackupAfterFileChange": false, "treeStructure": false,