vault backup: 2026-03-09 00:29:29

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "2026-03-09"
             }
+          },
+          {
+            "id": "1027de382671759d",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
             }
-        ]
+          }
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -177,10 +192,12 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "7c6ab6b8545d7eb1",
+  "active": "1027de382671759d",
   "lastOpenFiles": [
-    "超级备忘/课内备忘/截屏2026-03-09 00.21.23.png",
     "2026-03-09.md",
+    "conflict-files-obsidian-git.md",
+    "个人日记/2026-03-08.md",
+    "超级备忘/课内备忘/截屏2026-03-09 00.21.23.png",
     "超级备忘/课内备忘/课表.md",
     "超级备忘/课内备忘",
     "超级备忘",
@@ -217,7 +234,6 @@
     "零碎的知识/数学建模导论 -2025年2月学习笔记.md",
     "零碎的知识/bashrc中设置宏定义.md",
     "零碎的知识/ubuntu新建用户.md",
-    "零碎的知识/eda踩雷记录.md",
     "rm常用库/Pasted image 20260205113541.png",
     "rm常用库/Pasted image 20260205113442.png",
     "rm常用库/Pasted image 20260205113634.png"

conflict-files-obsidian-git.md

@@ -0,0 +1,17 @@
+# Conflicts
+Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- Not a file: .obsidian/workspace.json
+
+# Additional Instructions
+I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
+
+```diff
+<<<<<<< HEAD
+    File changes in local repository
+=======
+    File changes in remote repository
+>>>>>>> origin/main
+```

个人日记/2026-03-08.md

@@ -0,0 +1,6 @@
+现在是白天，12点起来的哈哈哈
+今天大概完成把论文的模型结构完全摸清楚，列出结构图
+跑一下步兵的视觉看看有什么问题
+跑一下mac上的foxglove
+想办法解决一下路由器网络问题
+还得把教材找一下