jdahlin/medical-notes
1
0
Fork 0
Code Actions Activity

vault backup: 2025-12-22 02:56:57
All checks were successful
Deploy Quartz site to GitHub Pages / build (push) Successful in 2m13s
Details

Browse Source
This commit is contained in:
Johan Dahlin
2025-12-22 02:56:57 +01:00
parent 3ae6c10557
commit 5a2b99c99a
26 changed files with 208 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
content/conflict-files-obsidian-git.md
View File

@@ -1,17 +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: content/.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
```