"Error Loading File Diff" after `git pull --rebase`

[michaelwimmer]

Problem

I have configured a git repository to use the rebase pull-strategy by git config pull.rebase true. I then set up a situation where the remote and the local repository have conflicting commits. After pulling via the graphical user interface, the conflicted file shows up in "Conflicted". However, when clicking on the "diff" button, I only get the error

Error Loading File Diff: Error while determining if file is binary or text 'fatal: bad revision 'MERGE_HEAD'

In the GUI, this looks like this:

At the same time, the output of git status is

interactive rebase in progress; onto a3ec5b0
Last command done (1 command done):
   pick dc25cef hsdhs
No commands remaining.
You are currently rebasing branch 'main' on 'a3ec5b0'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

Things I tried

I also tried editing the file by hand resolving the conflict in that way. When I then click on "Mark as resolved", I get the error "Failed to get a valid file value."

Versions

I tried jupyterlab 3.6.1 and jupyterlab 3.5.0
jupyterlab-git 0.41.0

[welcome]

Thank you for opening your first issue in this project! Engagement like this is essential for open source projects! 🤗

If you haven't done so already, check out Jupyter's Code of Conduct. Also, please try to follow the issue template as it helps other other community members to contribute more effectively.

You can meet the other Jovyans by joining our Discourse forum. There is also an intro thread there where you can stop by and say Hi! 👋

Welcome to the Jupyter community! 🎉