cambios SS 2024-10-24 12:44:27

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "SS 24-25"
             }
+          },
+          {
+            "id": "0137e113676ad163",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -175,12 +190,13 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "af3658905894d992",
+  "active": "0137e113676ad163",
   "lastOpenFiles": [
+    "TERCERO/SS/SS 24-25.md",
+    "conflict-files-obsidian-git.md",
     "Pasted image 20241024113018.png",
     "Pasted image 20241024090239.png",
     "TERCERO/SPD/images/Pasted image 20241022150214.png",
-    "conflict-files-obsidian-git.md",
     "TERCERO/ATR1/images/Pasted image 20241020204947.png",
     "TERCERO/ATR1/images/Pasted image 20241020204701.png",
     "TERCERO/ATR1/images/Pasted image 20241020204340.png",
@@ -190,9 +206,7 @@
     "TERCERO/SPD/images/Pasted image 20241022144429.png",
     "TERCERO/SPD/Teoría_2425.md",
     "TERCERO/SPD/images/Pasted image 20241022134454.png",
-    "Imagen de WhatsApp 2024-10-22 a las 11.43.21_270060da.jpg",
     "TERCERO/IA/Teoría_2425.md",
-    "TERCERO/SS/SS 24-25.md",
     "TERCERO/ATR1/Teoría_2425.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
+```