From daa8cab29ddab04f038e55b78446877f7d5e8e35 Mon Sep 17 00:00:00 2001
From: Dmitry <ada.dmitry@gmail.com>
Date: Mon, 8 Jun 2026 23:26:46 +0300
Subject: [PATCH] ada-pc: 2026-06-08 23:26:46 | 2

Affected files:
.obsidian/appearance.json
.obsidian/plugins/obsidian-git/data.json
---
 .obsidian/appearance.json                |  2 +-
 .obsidian/plugins/obsidian-git/data.json | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.obsidian/appearance.json b/.obsidian/appearance.json
index be8761e..b44a9b6 100644
--- a/.obsidian/appearance.json
+++ b/.obsidian/appearance.json
@@ -11,6 +11,6 @@
   "baseFontSize": 16,
   "monospaceFontFamily": "FiraCode Nerd Font",
   "nativeMenus": false,
-  "showRibbon": false,
+  "showRibbon": true,
   "showViewHeader": false
 }
\ No newline at end of file
diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index 9a62352..e58df76 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -6,17 +6,17 @@
   "autoSaveInterval": 5,
   "autoPushInterval": 5,
   "autoPullInterval": 0,
-  "autoPullOnBoot": false,
+  "autoPullOnBoot": true,
   "autoCommitOnlyStaged": false,
   "disablePush": false,
-  "pullBeforePush": false,
+  "pullBeforePush": true,
   "disablePopups": false,
   "showErrorNotices": true,
   "disablePopupsForNoChanges": false,
-  "listChangedFilesInMessageBody": false,
+  "listChangedFilesInMessageBody": true,
   "showStatusBar": true,
   "updateSubmodules": false,
-  "syncMethod": "reset",
+  "syncMethod": "merge",
   "mergeStrategy": "none",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
@@ -28,7 +28,7 @@
   "showedMobileNotice": true,
   "refreshSourceControlTimer": 7000,
   "showBranchStatusBar": true,
-  "setLastSaveToLastCommit": false,
+  "setLastSaveToLastCommit": true,
   "submoduleRecurseCheckout": false,
   "gitDir": "",
   "showFileMenu": true,