Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.obsidian/plugins/recent-files-obsidian/data.json
#	.obsidian/workspace.json

.obsidian/plugins/recent-files-obsidian/data.json

@@ -4,6 +4,10 @@
       "basename": "2025-08-08",
       "path": "01-工作日记/2025-08-08.md"
     },
+    {
+      "basename": "conflict-files-obsidian-git",
+      "path": "conflict-files-obsidian-git.md"
+    },
     {
       "basename": "2025-08-04",
       "path": "01-工作日记/2025-08-04.md"
@@ -195,10 +199,6 @@
     {
       "basename": "Obsidian笔记多端同步解决办法-DiyBeta's Blog",
       "path": "10-WebClipper/Obsidian笔记多端同步解决办法-DiyBeta's Blog.md"
-    },
-    {
-      "basename": "Docker系列 安装个人RSS服务TTRSS 手机完美适配 - 知乎",
-      "path": "10-WebClipper/Docker系列 安装个人RSS服务TTRSS 手机完美适配 - 知乎.md"
     }
   ],
   "omittedPaths": [],

.obsidian/workspace.json

@@ -299,18 +299,19 @@
       "password-protection:开启密码保护": false,
       "soundscapes:Soundscapes: My Music": false,
       "sheet-plus:创建 Excel 文件": false,
+      "hidden-folder-obsidian:隐藏文件夹": false,
       "periodic-notes:Open today": false
     }
   },
   "active": "b30dd120f71be716",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
+    "01-工作日记/2025-08-08.md",
     "01-工作日记/2025-08-04.md",
     "01-工作日记/2025-08-03.md",
     "01-工作日记/2025-08-01.md",
     "README.md",
     "欢迎.md",
-    "01-工作日记/2025-08-08.md",
-    "conflict-files-obsidian-git.md",
     "03-学习笔记/Docker/mac 安装及使用docker_docker for mac-CSDN博客.md",
     "03-学习笔记/Docker/如何在Docker中，修改已经挂载的卷（Volume）.md",
     "03-学习笔记/Docker/Mac使用docker时，卷默认挂载路径-var-lib-docker-volumes不存在问题_mac docker 卷默认挂载路径不存在-CSDN博客.md",

conflict-files-obsidian-git.md

@@ -0,0 +1,18 @@
+# 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/plugins/recent-files-obsidian/data.json
+- 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
+```