Merge remote-tracking branch 'origin/main'

2026-05-28 18:30:20 -04:00
parent 67d3358c86 fe518f570d
commit 9cb2598add
7 changed files with 47 additions and 8 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,