#7

Putting .obsidian in your .gitignore will not sync your settings and workspaces, but if you don’t want your settings to sync, it’s fine to put .obsidian in your .gitignore.

#8

This is where I get lost:

image
image1310×170 14.8 KB

Where do I enable “pull updates on startup”? Where do I disable the disable push option? I don’t see it anywhere in my settings.

#9

When you go into settings, you should see “Obsidian Git” under “Plugin Options” on the left. If you click on “Obsidian Git,” you should be able to tinker with the settings you are referring to.

#10

AH that’s the problem. I don’t see Obsidian Git under Plugin Options. I installed it from within Obsidian; perhaps a manual installation is called for?

1 Like
#11

I reinstalled it, and all is well. Thanks, @JonathanBuchh!

1 Like
#12

No problem @skeskali. Sometimes you have to restart the app to see the settings for a new plugin (I’ve only had to do it for Obsidian Git).

#13

For le the settings appeared only when my vault had github files in it.

#14

Ok so I had an error for obsidian config files again.

Basically, sync with github between two windows computer.

Here the error :

Uncaught (in promise) Error: From https://github.com/####/Zettelkasten
18bf750..b352192  main       -> origin/main
error: Your local changes to the following files would be overwritten by merge:
.obsidian/workspace
Please commit your changes or stash them before you merge.
Aborting

at GitExecutorChain.onFatalException (eval at <anonymous> (app.js:1), <anonymous>:2302:85)
at GitExecutorChain.eval (eval at <anonymous> (app.js:1), <anonymous>:2293:28)
at Generator.throw (<anonymous>)
at rejected (eval at <anonymous> (app.js:1), <anonymous>:2247:65)
#15

I had the problem:

11index.html:2302 Uncaught (in promise) Error: Error: spawn git ENOENT
   at Process.ChildProcess._handle.onexit (internal/child_process.js:267)
   at onErrorNT (internal/child_process.js:469)
   at processTicksAndRejections (internal/process/task_queues.js:84)
   at GitExecutorChain.onFatalException (eval at <anonymous> (app.js:1), <anonymous>:2302:85)
   at GitExecutorChain.eval (eval at <anonymous> (app.js:1), <anonymous>:2293:28)
   at Generator.throw (<anonymous>)
   at rejected (eval at <anonymous> (app.js:1), <anonymous>:2247:65)
DevTools failed to load SourceMap: Could not parse content for app://obsidian.md/main.js.map: Unexpected end of JSON input

and

VM392:131 Uncaught (in promise) Error: Error: spawn git ENOENT
    at Process.ChildProcess._handle.onexit (internal/child_process.js:267)
    at onErrorNT (internal/child_process.js:469)
    at processTicksAndRejections (internal/process/task_queues.js:84)
    at GitExecutorChain.onFatalException (eval at <anonymous> (app.js:1), <anonymous>:2302:85)
    at GitExecutorChain.eval (eval at <anonymous> (app.js:1), <anonymous>:2293:28)
    at Generator.throw (<anonymous>)
    at rejected (eval at <anonymous> (app.js:1), <anonymous>:2247:65)

After installing Git client.
And input the environment variables to System path
Then the plugin work ok.

#16

Already did both :confused: thanks !

#17

Did you restart your computer after these 2 steps?

#18

Yes still have workspace sync issue after reboot.

#19

Then i dont know…

#21

So you have obsidian git, git client, and the git hub repository set up but you’re experiencing conflicts when pushing changes from your local vault to your remote repository? I may need to update the initial forum post to add the .gitignore file. What does your remote repository look like on Github right now? Is it possible to display an image of that in this thread?

#22

I have stash my git folder on my second computer. It works so far…

Thanks

#23

I got the same problem without the setting option.

#24

Have you tried restarting Obsidian? That usually works for me.

#25

I’v tried that, but it didn’t work. Thanks for your suggestion and I will try later again.

#26

Try open developer console (ctrl + shift + i). See if your problem is the same.
If it is the same, then you need to install git client and add environment variables to system path

#27

The problem appear again :confused:

git-error.js:31 Uncaught (in promise) Error: error: Your local changes to the following 
files would be overwritten by merge:
.obsidian/workspace
Please commit your changes or stash them before you merge.
Aborting

at GitExecutorChain.onFatalException (eval at evalFunc (app.js:1), <anonymous>:2302:85)
at GitExecutorChain.eval (eval at evalFunc (app.js:1), <anonymous>:2293:28)
at Generator.throw (<anonymous>)
at rejected (eval at evalFunc (app.js:1), <anonymous>:2247:65)

When pull changes to my computer 2.

My repository :

image
image936×299 14.3 KB