Haina
/
vault-haina
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '36e24eabe2'
${ noResults }
vault-haina/conflict-files-obsidian-git.md

799 B
Raw Blame History

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

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.

<<<<<<< HEAD
    File changes in local repository
=======
    File changes in remote repository
>>>>>>> origin/main