vault backup: 2025-11-17 08:45:19

.gitignore

@@ -0,0 +1,4 @@
+.obsidian/appearance.json
+.obsidian/workspace.json
+.obsidian/app.json
+.obsidian/plugins/obsidian-git/**

.obsidian/appearance.json

@@ -1,4 +1,5 @@
 {
-  "cssTheme": "Material Flat",
-  "showViewHeader": true
-}
+  "cssTheme": "Cupertino",
+  "showRibbon": true,
+  "translucency": false
+}

.obsidian/workspace.json

@@ -7,6 +7,34 @@
         "id": "e0578e41bd228cdb",
         "type": "tabs",
         "children": [
+          {
+            "id": "8a58058b60b0f8e2",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "4.2/1.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "1"
+            }
+          },
+          {
+            "id": "2524b2f3f1e2708a",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": true
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
+          },
           {
             "id": "4391c77430fca8f8",
             "type": "leaf",
@@ -20,22 +48,9 @@
               "icon": "lucide-file",
               "title": "2"
             }
-          },
-          {
-            "id": "de165f0f9ededdcb",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "4.2/2.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "2"
-            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -55,7 +70,7 @@
               "type": "file-explorer",
               "state": {
                 "sortOrder": "alphabetical",
-                "autoReveal": false
+                "autoReveal": true
               },
               "icon": "lucide-folder-closed",
               "title": "Files"
@@ -92,8 +107,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 300,
-    "collapsed": true
+    "width": 300
   },
   "right": {
     "id": "1aca95e9c21abecb",
@@ -185,11 +199,13 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "4391c77430fca8f8",
+  "active": "2524b2f3f1e2708a",
   "lastOpenFiles": [
     "4.2/1.md",
-    "4.2/3.md",
+    "conflict-files-obsidian-git.md",
     "4.2/2.md",
+    "tests.md",
+    "4.2/3.md",
     "3_1/2.md",
     "3_1/1-0.2.0.md",
     "3_1/3practice.md",

tests.md

@@ -0,0 +1,3 @@
+- [f] Awesome!🔥
+- [x] new to
+- [?] Resolve, how to do so?