Vinzent03/obsidian-git

[Bug]: Cannot resolve merge

spectrMeltdown opened this issue · 0 comments

Describe the bug

Is possible to merge when the remote has deleted or moved a file?

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

On branch master
Your branch and 'origin/master' have diverged,
and have 10 and 8 different commits each, respectively.
  (use "git pull" if you want to integrate the remote branch with yours)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)
        deleted by them: Church/SEMINARY JAN 28.md
        deleted by them: Church/Seminary - Attendance.md
        deleted by them: Church/Seminary - Pacing Guide.md
        deleted by them: Church/Seminary - Plans for next semester.md
        both modified:   Money Plans.md

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        conflict-files-obsidian-git.md

no changes added to commit (use "git add" and/or "git commit -a")
~/.../shared/notes $ git rebase
fatal: unable to get current working directory: No such file or directory

Steps to reproduce

  1. Move or delete file in remote
  2. Pull on Obsidian mobile

Expected Behavior

a way to checkout or merge

Addition context

Screenshot_20241117-103745

Operating system

Android

Installation Method

None

Plugin version

2.28.2