vault backup: 2026-05-27 20:08:22

2026-05-27 20:08:22 -04:00
parent e42491a238
commit 484648e9f0
3 changed files with 4 additions and 4 deletions
@@ -16,8 +16,8 @@
  "listChangedFilesInMessageBody": false,
  "showStatusBar": true,
  "updateSubmodules": false,
-  "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "syncMethod": "rebase",
+  "mergeStrategy": "ours",
  "customMessageOnAutoBackup": false,
  "autoBackupAfterFileChange": false,
  "treeStructure": false,