Help to resolve the conflict "Not a file: .obsidian/workspace.json"

Help
1

I don’t understand why I have the following error in Obsidian when using the Obsidian Git plugin:

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

  • 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

Although in .gitignore is registered:
.obsidian/
?

1 Like
2

Hey, I had the same problem and the fix was.

git rm --cached .obsidian/workspace.json

also you have to create a .gitignore file and include .obsidian/workspace.json

read more on obsidiangit tips and tricks
you can read more about it in stackoverflow: How do I make Git forget about a file that was tracked, but is now in .gitignore?

3

This topic was automatically closed 90 days after the last reply. New replies are no longer allowed.