IA: 2024-12-04 09:52:57

.obsidian/workspace.json

@@ -175,26 +175,26 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "b40a18c39aef8e17",
+  "active": "e1d369c3109e86c5",
   "lastOpenFiles": [
-    "TERCERO/ATR1/Teoría_2425.md",
-    "Pasted image 20241127111215.png",
-    "Pasted image 20241127110759.png",
+    "conflict-files-obsidian-git.md",
     "TERCERO/IA/Teoría_2425.md",
-    "Sin título.png",
-    "Pasted image 20241127091943.png",
-    "Pasted image 20241127091902.png",
-    "Pasted image 20241127091731.png",
-    "Pasted image 20241127091611.png",
-    "TERCERO/ATR1/images/Captura de pantalla de 2024-11-20 10-54-39.png",
-    "TERCERO/ATR1/images/Pasted image 20241125141142.png",
-    "TERCERO/ATR1/images/Pasted image 20241125145544.png",
+    "TERCERO/SS/images/Pasted image 20241125145544.png",
+    "TERCERO/SS/images/Pasted image 20241125145439.png",
+    "TERCERO/SS/images/Pasted image 20241125145413.png",
+    "TERCERO/SS/images/Pasted image 20241125145411.png",
+    "TERCERO/SS/images/Pasted image 20241125145409.png",
+    "TERCERO/SS/images/Pasted image 20241125144536.png",
+    "TERCERO/SS/images/Pasted image 20241125144533.png",
+    "TERCERO/SS/images/Pasted image 20241125143529.png",
+    "TERCERO/SS/images/Pasted image 20241125141145.png",
+    "TERCERO/SS/images/Pasted image 20241125141142.png",
+    "TERCERO/ATR1/Teoría_2425.md",
     "TERCERO/SS/SS 24-25.md",
     "TERCERO/SPD/Teoría_2425.md",
     "Untitled.md",
     "TERCERO/ATR1/Resolución 1 Parcial ATR1.md",
     "TERCERO/ATR1/Ejercicios.md",
-    "conflict-files-obsidian-git.md",
     "TERCERO/SPD/P4_SPD.md",
     "TERCERO/SS/SS Lab.md",
     "SEGUNDO/ADDA/Teoría_2324.md",

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
+```