From 284562556d470823ce56ee182ed73f1ecd778854 Mon Sep 17 00:00:00 2001 From: Jasper Ras Date: Tue, 15 Jul 2025 20:34:35 +0200 Subject: vault backup: 2025-07-15 20:34:35 --- conflict-files-obsidian-git.md | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 conflict-files-obsidian-git.md (limited to 'conflict-files-obsidian-git.md') diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md deleted file mode 100644 index e8b46b1..0000000 --- a/conflict-files-obsidian-git.md +++ /dev/null @@ -1,18 +0,0 @@ -# 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: .trash/daily/23-Jun-2025.md -- [[17-May-2025]] - -# 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 -- cgit v1.2.3