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

vault backup: 2025-12-20 23:33:28

Browse Source
This commit is contained in:
Johan Dahlin
2025-12-20 23:33:28 +01:00
parent 098dc9c8db
commit 3ae6c10557
3 changed files with 89 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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: 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
```