obsidian-git icon indicating copy to clipboard operation
obsidian-git copied to clipboard

[Bug]: wrong order in git backup

Open LFSaw opened this issue 4 months ago • 3 comments

Describe the bug

Merge conflicts when doing Git: Create backup in a 2 machine scenario

Relevant errors (if available) from notifications or console (CTRL+SHIFT+I)

No response

Steps to reproduce

  • 2 instances of obsidian vault on different machines (A , B), each with the same obsidian-git settings (apart from machine ID)
  • edit the same file on machine A and B
  • Git: Create backup on machine A
  • Git: Create backup on machine B

results in merge conflict.

Expected Behavior

no merge conflict.

This could be achieved by a git command sequence within Git: Create backup:

  1. git commit
  2. git pull [--rebase]
  3. git push

Addition context

No response

Operating system

macOS

Installation Method

None

Plugin version

2.24.1

LFSaw avatar Apr 09 '24 09:04 LFSaw