From 17c987bab48fbc21288f63c689985968c933b2bc Mon Sep 17 00:00:00 2001
From: Gentleman-DE <jordibolz.jb@gmail.com>
Date: Mon, 24 Apr 2023 18:49:02 +0200
Subject: [PATCH] Create conflict-files-obsidian-git.md

---
 conflict-files-obsidian-git.md | 18 ++++++++++++++++++
 1 file changed, 18 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..58fdafa
--- /dev/null
+++ b/conflict-files-obsidian-git.md
@@ -0,0 +1,18 @@
+# Conflicts
+Please resolve them and commit them using the commands `Obsidian Git: Commit all changes` followed by `Obsidian Git: Push`
+(This file will automatically be deleted before commit)
+[[#Additional Instructions]] available below file list
+
+- Not a file: .obsidian/workspace.json
+- [[KW17]]
+
+# 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