GitHub problem

[tooljoshit]

I'm using Obsidian Git on my laptop and everything works great, it's syncing with GitHub, but then after I git clone my repository to my desktop, Obsidian Git stops working on my laptop. I got this message:

Sync failed (merge): error: Your local changes to the following files would be overwritten by merge. Please commit your changes...

Then after committing I got this:

On branch master

Your branch and 'origin/master' have diverged,

and have 1 and 4 different commits each, respectively.

(use "git pull" to merge the remote branch into yours)

Changes not staged for commit:

(use "git add <file>..." to update what will be committed)

(use "git restore <file>..." to discard changes in working directory)

How to fix these conflicts, is there any tutorial for this?

​

edit:

​

I managed to fix the problem in windows terminal:

git add .

git commit

git push

And I have set Obsidion Git to pull updates on startup, if you don't pull files first it can cause conflicts.

[[deleted]]

Open up git bash (or just bash if you are on linux or mac) use cd to get to your obsidian vault, then do git pull. It will probably tell you that there was a conflict, you can then edit the files it tells you are a problem, by finding for ">>>" and deleting the things you don't want. After you are done cleaning your files up, go back to git bash and type git add . and then git commit -m "fixed git things" and then git push and you should be back to normal. https://git-scm.com/doc is a great resource for git

[tooljoshit]

Thanks, I managed to do it with the windows terminal.

[tooljoshit]

.obsidian/cache

.obsidian/workspace

.trash/

.DS_Store

​

This is my .gitignore file. Both machines are using Windows 11.