From 9e0dd7c6ec65af4ab3dce242b7d46623e382a98d Mon Sep 17 00:00:00 2001
From: SeedList <LanMeredith.usually@outlook.com>
Date: Sat, 12 Jul 2025 21:41:04 +0800
Subject: [PATCH] vault backup: 2025-07-12 21:41:04

---
 .obsidian/graph.json                    | 66 +++++++++++++++++--------
 .trash/conflict-files-obsidian-git 3.md | 17 +++++++
 .trash/conflict-files-obsidian-git 4.md | 17 +++++++
 .trash/conflict-files-obsidian-git 5.md | 17 +++++++
 4 files changed, 97 insertions(+), 20 deletions(-)
 create mode 100644 .trash/conflict-files-obsidian-git 3.md
 create mode 100644 .trash/conflict-files-obsidian-git 4.md
 create mode 100644 .trash/conflict-files-obsidian-git 5.md

diff --git a/.obsidian/graph.json b/.obsidian/graph.json
index 148e0c2d..74eb70c1 100644
--- a/.obsidian/graph.json
+++ b/.obsidian/graph.json
@@ -1,22 +1,48 @@
 {
-  "collapse-filter": true,
-  "search": "",
-  "showTags": false,
-  "showAttachments": false,
-  "hideUnresolved": false,
-  "showOrphans": true,
-  "collapse-color-groups": true,
-  "colorGroups": [],
-  "collapse-display": true,
-  "showArrow": false,
-  "textFadeMultiplier": 0,
-  "nodeSizeMultiplier": 1,
-  "lineSizeMultiplier": 1,
-  "collapse-forces": true,
-  "centerStrength": 0.518713248970312,
-  "repelStrength": 10,
-  "linkStrength": 1,
-  "linkDistance": 250,
-  "scale": 1.0000000000000013,
-  "close": true
+    "collapse-filter": false,
+    "search": "",
+    "showTags": false,
+    "showAttachments": false,
+    "hideUnresolved": false,
+    "showOrphans": true,
+    "collapse-color-groups": false,
+    "colorGroups":
+    [
+        {
+            "query": "path:SanPinPLM  ",
+            "color":
+            {
+                "a": 1,
+                "rgb": 14048348
+            }
+        },
+        {
+            "query": "path:外发客户教程  ",
+            "color":
+            {
+                "a": 1,
+                "rgb": 14069084
+            }
+        },
+        {
+            "query": "path:设计软件使用  ",
+            "color":
+            {
+                "a": 1,
+                "rgb": 11392604
+            }
+        }
+    ],
+    "collapse-display": false,
+    "showArrow": false,
+    "textFadeMultiplier": 0,
+    "nodeSizeMultiplier": 1,
+    "lineSizeMultiplier": 1,
+    "collapse-forces": false,
+    "centerStrength": 0.518713248970312,
+    "repelStrength": 10,
+    "linkStrength": 1,
+    "linkDistance": 250,
+    "scale": 0.3865410244547755,
+    "close": true
 }
\ No newline at end of file
diff --git a/.trash/conflict-files-obsidian-git 3.md b/.trash/conflict-files-obsidian-git 3.md
new file mode 100644
index 00000000..058a9a76
--- /dev/null
+++ b/.trash/conflict-files-obsidian-git 3.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/graph.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
+```
\ No newline at end of file
diff --git a/.trash/conflict-files-obsidian-git 4.md b/.trash/conflict-files-obsidian-git 4.md
new file mode 100644
index 00000000..058a9a76
--- /dev/null
+++ b/.trash/conflict-files-obsidian-git 4.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/graph.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
+```
\ No newline at end of file
diff --git a/.trash/conflict-files-obsidian-git 5.md b/.trash/conflict-files-obsidian-git 5.md
new file mode 100644
index 00000000..058a9a76
--- /dev/null
+++ b/.trash/conflict-files-obsidian-git 5.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/graph.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
+```
\ No newline at end of file