vault backup: 2026-04-24 23:35:39

.gitignore

@@ -1,3 +1,6 @@
 .obsidian/workspace.json
 .obsidian/workspace-mobile.json
 .DS_Store
+.obsidian/graph.json
+.obsidian/hotkeys.json
+.obsidian/*.sync-*

.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,