vault backup: 2025-08-08 18:34:57

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

@@ -4,10 +4,6 @@
       "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"

.obsidian/workspace.json

@@ -298,9 +298,7 @@
       "file-tree-alternative:File Tree Alternative Plugin": false,
       "password-protection:开启密码保护": false,
       "soundscapes:Soundscapes: My Music": false,
-      "sheet-plus:创建 Excel 文件": false,
-      "hidden-folder-obsidian:隐藏文件夹": false,
-      "periodic-notes:Open today": false
+      "sheet-plus:创建 Excel 文件": false
     }
   },
   "active": "b30dd120f71be716",

01-工作日记/2025-08-08.md

@@ -26,6 +26,7 @@ https://www.chenqiang1986.cn/index.php/2024/12/02/omnivore%e7%a7%81%e6%9c%89%e5%
 
 - Edge：整理集锦，集锦就是edge的阅读列表（稍后阅读）
 - OB：Mac会产生一些._*文件，很恶心！只要往windows传送文件。。。
+- OB：两个客户端同时编辑一个Vault。肯定会产生git冲突，最好提交修改后再进另一个客户端工作！解决办法：Fork进行干预,resovled->staged->commit->push
 - 
 ## 3 Tips
 - Unix与WIndows：在Mac下编辑的脚本不能直接在Windows使用，换行和字符集不一样，调试时才想起来！

conflict-files-obsidian-git.md

@@ -1,18 +0,0 @@
-# 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
-```