Merge remote-tracking branch 'origin/main'

# Conflicts: # .obsidian/workspace.json
2025-08-08 17:47:17 +08:00
commit c7b872a34e
@@ -1,4 +0,0 @@
-._*
-.DS_Store
-
-
@@ -48,6 +48,5 @@
  "podnotes",
  "sheet-plus",
  "obsidian-excel-to-markdown-table",
-  "obsidian-clipper",
-  "obsidian-readwise"
+  "obsidian-clipper"
 ]
@@ -0,0 +1,10 @@
+{
+  "syncOnBoot": false,
+  "autoSyncInterval": 0,
+  "disableNotifications": false,
+  "headerTemplatePath": "",
+  "highlightTemplatePath": "",
+  "highlightStoragePath": "",
+  "authorsMappingFilename": "authors.json",
+  "lastUpdate": 1754645321355
+}
@@ -1,5 +1,13 @@
 {
  "recentFiles": [
+    {
+      "basename": "2025-08-08",
+      "path": "01-工作日记/2025-08-08.md"
+    },
+    {
+      "basename": "conflict-files-obsidian-git",
+      "path": "conflict-files-obsidian-git.md"
+    },
    {
      "basename": "mac 安装及使用docker_docker for mac-CSDN博客",
      "path": "03-学习笔记/Docker/mac 安装及使用docker_docker for mac-CSDN博客.md"
@@ -64,10 +72,6 @@
      "basename": "苦心ios导航 - 果粉用的上的导航网站",
      "path": "20-我的收藏夹/21-浏览器收藏/Favorites/苦心ios导航 - 果粉用的上的导航网站.md"
    },
-    {
-      "basename": "2025-08-08",
-      "path": "01-工作日记/2025-08-08.md"
-    },
    {
      "basename": "Applehub心动  IOS免费软件源轻松签全能签喵喵签软件源IPA下载Mac软件",
      "path": "20-我的收藏夹/21-浏览器收藏/Favorites/Applehub心动  IOS免费软件源轻松签全能签喵喵签软件源IPA下载Mac软件.md"
@@ -195,10 +199,6 @@
    {
      "basename": "Draft202508",
      "path": "08-Inbox/Draft202508.md"
-    },
-    {
-      "basename": "十多天了又来了岳麓山，好多人，身体好像胖了一点，继续保持运动！ (2025-08-04 10-54)",
-      "path": "50-Memos/2025/08/十多天了又来了岳麓山，好多人，身体好像胖了一点，继续保持运动！ (2025-08-04 10-54).md"
    }
  ],
  "omittedPaths": [],
@@ -13,12 +13,12 @@
            "state": {
              "type": "markdown",
              "state": {
-                "file": "03-学习笔记/Docker/mac 安装及使用docker_docker for mac-CSDN博客.md",
+                "file": "01-工作日记/2025-08-08.md",
                "mode": "source",
                "source": false
              },
              "icon": "lucide-file",
-              "title": "mac 安装及使用docker_docker for mac-CSDN博客"
+              "title": "2025-08-08"
            }
          }
        ]
@@ -298,11 +298,16 @@
      "file-tree-alternative:File Tree Alternative Plugin": false,
      "password-protection:开启密码保护": false,
      "soundscapes:Soundscapes: My Music": false,
-      "sheet-plus:创建 Excel 文件": 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",
+    "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",
    "09-Templates/概括文章骨架.md",
@@ -318,7 +323,6 @@
    "20-我的收藏夹/21-浏览器收藏/Favorites/ipa软件下载ios软件下载.md",
    "20-我的收藏夹/21-浏览器收藏/Favorites/AList 桌面版.md",
    "20-我的收藏夹/21-浏览器收藏/Favorites/苦心ios导航 - 果粉用的上的导航网站.md",
-    "01-工作日记/2025-08-08.md",
    "20-我的收藏夹/21-浏览器收藏/Favorites/Applehub心动  IOS免费软件源轻松签全能签喵喵签软件源IPA下载Mac软件.md",
    "20-我的收藏夹/21-浏览器收藏/Favorites/快速安装Homebrew教程 - Homebrew 中文网.md",
    "20-我的收藏夹/21-浏览器收藏/Favorites/Mac和iOS最佳免费工具App集合 - Oka Apps.md",
@@ -329,8 +333,6 @@
    "20-我的收藏夹/21-浏览器收藏/Favorites/数码荔枝 - 专注于分享最新鲜优秀的正版软件.md",
    "20-我的收藏夹/21-浏览器收藏/Favorites/azw3_mobi_epub_kindle电子书免费下载_爱悦读网.md",
    "20-我的收藏夹/21-浏览器收藏/Favorites",
-    "20-我的收藏夹/21-浏览器收藏/越狱/DerekSelanderyacd Decrypts FairPlay applications on iOS 13.4.1 and lower, no jb required.md",
-    "20-我的收藏夹/21-浏览器收藏/越狱/(33条消息) iOS 打包上传报错 You already have a current iOS Distribution certificate_Leecsdn77的博客-CSDN博客.md",
    "未命名 1.canvas",
    "未命名.canvas",
    "03-学习笔记/Docker",
@@ -25,6 +25,7 @@ https://www.chenqiang1986.cn/index.php/2024/12/02/omnivore%e7%a7%81%e6%9c%89%e5%
 - 学习raindrop:设置一个ClipperBox用于存放之后Highlights，浏览器插件保存，同步到OB，raindrop在浏览器部分可以进行批注和多次高亮设置，OB部分可以看到高亮域！帅！

 - Edge：整理集锦，集锦就是edge的阅读列表（稍后阅读）
+- OB：windows会产生一些._*文件，很恶心！
 - 
 ## 3 Tips
 - Unix与WIndows：在Mac下编辑的脚本不能直接在Windows使用，换行和字符集不一样，调试时才想起来！
@@ -1,15 +0,0 @@
---
-raindrop_id: 670464438
-
---
-
-# Metadata
-Source URL:: https://github.com/pygame/pygame
-
-
---
-# pygame/pygame: 🐍🎮 pygame (the library) is a Free and Open Source python programming language library for making multimedia applications like games built on top of the excellent SDL library. C, Python, Native, OpenGL.
-
-🐍🎮 pygame (the library) is a Free and Open Source python programming language library for making multimedia applications like games built on top of the excellent SDL library. C, Python, Native, Ope...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472434
-
---
-
-# Metadata
-Source URL:: https://www.bing.com/search?FORM=ANNTA1&amp;PC=U531&amp;aqs=edge..69i57j69i58.751335j0j4&amp;cvid=159129d853354035985028da9d698f51&amp;mkt=zh-CN&amp;pglt=41&amp;q=vlc%3A%2F%2Fhttp%3A%2F%2Flocalhost%3A5244%2Fd%2FEducation%2F%25E4%25B8%25AD%25E5%25B0%258F%25E5%25AD%25A6%25E6%2595%2599%25E8%2582%25B2%2F%25E5%258A%25A8%25E7%2594%25BB%2F%25E7%258C%25AB%25E5%2592%258C%25E8%2580%2581%25E9%25BC%25A0%25E4%25B8%258E%25E7%25A6%258F%25E5%25B0%2594%25E6%2591%25A9%25E6%2596%25AF.Tom.and.Jerry.Meet.Sherlock.Holmes.2010.BluRay.720p.AC3.x264.rmvb
-
-
---
-# vlc://http://localhost:5244/d/Education/%E4%B8%AD%E5%B0%8F%E5%AD%A6%E6%95%99%E8%82%B2/%E5%8A%A8%E7%94%BB/%E7%8C%AB%E5%92%8C%E8%80%81%E9%BC%A0%E4%B8%8E%E7%A6%8F%E5%B0%94%E6%91%A9%E6%96%AF.Tom.and.Jerry.Meet.Sherlock.Holmes.2010.BluRay.720p.AC3.x264.rmvb - Bing
-
-Intelligent search from Bing makes it easier to quickly find what you’re looking for and rewards you.
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472676
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/Docker-DocumentServer
-
-
---
-# ONLYOFFICE/Docker-DocumentServer: ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.
-
-ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472678
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/DocumentServer
-
-
---
-# ONLYOFFICE/DocumentServer: ONLYOFFICE Docs is a free collaborative online office suite comprising viewers and editors for texts, spreadsheets and presentations, forms and PDF, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.
-
-ONLYOFFICE Docs is a free collaborative online office suite comprising viewers and editors for texts, spreadsheets and presentations, forms and PDF, fully compatible with Office Open XML formats: ....
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472674
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/onlyoffice-nextcloud
-
-
---
-# ONLYOFFICE/onlyoffice-nextcloud: The app which enables the users to edit office documents from Nextcloud using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to Nextcloud
-
-The app which enables the users to edit office documents from Nextcloud using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to Nextclo...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472681
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/onlyoffice-owncloud
-
-
---
-# ONLYOFFICE/onlyoffice-owncloud: The app which enables the users to edit office documents from ownCloud using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to ownCloud
-
-The app which enables the users to edit office documents from ownCloud using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to ownCloud...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472673
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/onlyoffice-wordpress
-
-
---
-# ONLYOFFICE/onlyoffice-wordpress: The plugin which enables the users to edit office documents from WordPress using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to WordPress
-
-The plugin which enables the users to edit office documents from WordPress using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to Word...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472627
-
---
-
-# Metadata
-Source URL:: https://github.com/PaddlePaddle/PaddleOCR
-
-
---
-# PaddlePaddle/PaddleOCR: Awesome multilingual OCR toolkits based on PaddlePaddle (practical ultra lightweight OCR system, support 80+ languages recognition, provide data annotation and synthesis tools, support training and deployment among server, mobile, embedded and IoT devices)
-
-Awesome multilingual OCR toolkits based on PaddlePaddle (practical ultra lightweight OCR system, support 80+ languages recognition, provide data annotation and synthesis tools, support training and...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472752
-
---
-
-# Metadata
-Source URL:: https://github.com/arnaudsj/monit
-
-
---
-# arnaudsj/monit: Monit is a free open source utility for managing and monitoring, processes, files, directories and filesystems on a UNIX system. Monit conducts automatic maintenance and repair and can execute meaningful causal actions in error situations. (unofficial mirror)
-
-Monit is a free open source utility for managing and monitoring, processes, files, directories and filesystems on a UNIX system. Monit conducts automatic maintenance and repair and can execute mean...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472666
-
---
-
-# Metadata
-Source URL:: https://github.com/kalcaddle/kodbox
-
-
---
-# kalcaddle/kodbox: kodbox is a file manager for web. It is a newly designed product based on kodexplorer. It is also a web code editor, which allows you to develop websites directly within the web browser.You can run kodbox either online or locally,on Linux, Windows or Mac based platforms
-
-kodbox is a file manager for web. It is a newly designed product based on kodexplorer. It is also a web code editor, which allows you to develop websites directly within the web browser.You can run...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670473200
-
---
-
-# Metadata
-Source URL:: https://github.com/PaddlePaddle/PaddleOCR
-
-
---
-# PaddlePaddle/PaddleOCR: Awesome multilingual OCR toolkits based on PaddlePaddle (practical ultra lightweight OCR system, support 80+ languages recognition, provide data annotation and synthesis tools, support training and deployment among server, mobile, embedded and IoT devices)
-
-Awesome multilingual OCR toolkits based on PaddlePaddle (practical ultra lightweight OCR system, support 80+ languages recognition, provide data annotation and synthesis tools, support training and...
-
-## Highlights
@@ -1,14 +0,0 @@
---
-raindrop_id: 670473111
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/Docker-DocumentServer
-
-
---
-# ONLYOFFICE/Docker-DocumentServer: ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.
-
-ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472921
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/Docker-DocumentServer
-
-
---
-# ONLYOFFICE/Docker-DocumentServer: ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.
-
-ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and...
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472919
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/DocumentServer
-
-
---
-# ONLYOFFICE/DocumentServer: ONLYOFFICE Docs is a free collaborative online office suite comprising viewers and editors for texts, spreadsheets and presentations, forms and PDF, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.
-
-ONLYOFFICE Docs is a free collaborative online office suite comprising viewers and editors for texts, spreadsheets and presentations, forms and PDF, fully compatible with Office Open XML formats: ....
-
-## Highlights
@@ -1,15 +0,0 @@
---
-raindrop_id: 670472917
-
---
-
-# Metadata
-Source URL:: https://github.com/ONLYOFFICE/onlyoffice-owncloud
-
-
---
-# ONLYOFFICE/onlyoffice-owncloud: The app which enables the users to edit office documents from ownCloud using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to ownCloud
-
-The app which enables the users to edit office documents from ownCloud using ONLYOFFICE Document Server, allows multiple users to collaborate in real time and to save back those changes to ownCloud...
-
-## Highlights
@@ -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
+```