From ec916a9eca4a97d7075036c04875cd9508405898 Mon Sep 17 00:00:00 2001
From: fzzinchemical <mathys162002@gmail.com>
Date: Wed, 29 Oct 2025 10:27:35 +0100
Subject: [PATCH] Add conflict resolution instructions for Git

---
 conflict-files-obsidian-git.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 conflict-files-obsidian-git.md

diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
new file mode 100644
index 0000000..d8bbd4f
--- /dev/null
+++ b/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
+```
\ No newline at end of file