Gallardo7761/etsii-vault
1
0
Fork 0
Code Issues Activity

cambios

Browse Source
This commit is contained in:
Jose
2024-11-11 08:18:41 +01:00
parent c4db512229
commit ffb508b8e2
3 changed files with 31 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
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: .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
```