Peaceultime
/
system-aspect
1
0
Fork 0
Code Issues Actions Activity

vault sync 2024-07-02 20:30:48

This commit is contained in:
Peaceultime 2024-07-02 20:30:48 +02:00
parent 34b362de08
commit 57f9a9e0a9
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
conflict-files-obsidian-git.md
View File

@ -1,18 +0,0 @@
# 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
- [[Progression.canvas]]
- [[Les évolutions de valeur.canvas]]
# 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
```