Obsidian Git Android pushes on opening

Maybe I don’t get how this works, but if I say

  1. make a change on PC and remove a note then run obsidian:backup
  2. open my Obsidian app on Android, then
    it seems to then complain about differences, but goes ahead and pushes the old file that was deleted on PC straight back to GitHub. This in turn will result in the PC next pulling that note right back when it opens…

How do I keep GitHub as the source of truth and mirror that?

Thanks :slight_smile:

What I’m trying to do

Things I have tried

Just a verification question: you’re sure that both devices are set up with same time zone? Devices not being in the same time zone has caused me some grief in the past.

Furthermore, is git the only tool you’re using for syncing your tools? There is not anything else like iCloud, Google drive, … ?

Thanks for the reply. Yes, both same timezone, and no other backup tools. Well, the pc’s Obsidian folder lives in documents, which is actually part of OneDrive, but that simply mirrors whatever goes on in the PC.

However, I think I may have found it. There is a setting inside the plugin called “Pull changes before push.” Kinda makes sense to turn that off. Seems to have done the trick :slight_smile:

[EDIT] - Re-reading that, it doesn’t make sense…

It feels more natural to pull any changes first, to check the status of the remote, before you want to push your latest additions.

So, are we then back to square one, and you still have the issue?

Yea I switched that back straight away. How about this?
It seems to function with sync method set to rebase as opposed to merge

Can you explain the different actions of merge vs rebase?