Merge cannot be finalized if local change is chosen to resolve conflict

[michaelwimmer]

Description

When solving a merge conflict is solved by choosing completely for the local version, the merge cannot be finished from the user interface.

Consider a situation where one file has conflicting commits in the local and the remote repository. In this case, clicking on "diff" on the filename in the "Conflicted" category allows to fix the merge conflict:

Then chose the local version:

After clicking on "Mark as resolved", the interface ends up in a stage where a remote change is detected, but it is not possible to finish the merge

To the contrary, if say the remote version was chosen, the file would appear in the "Staged" category.

I believe this is due to the fact that when choosing the local variant, the file does not show up as "modified" in git status, whereas it does when it is changed to resolve the conflict.

Reproduce

1. Clone a repository
2. Make conflicting changes in the local and the remote repository
3. Pull
4. Open the diff to solve the merge conflict
5. Choose the local version as solution
6. Click on "Mark as resolved"
7. The interface is now in a stuck situation. It can only be fixed by using the command line git

Expected behavior

I would expect to be able to finalize the merge

Context

• Python package version:
  jupyterlab-git 0.41.0 pyhd8ed1ab_1 conda-forge
• Extension version:

JupyterLab v3.6.1
/home/michael/miniconda3/envs/jupgit/share/jupyter/labextensions
        jupyterlab_pygments v0.2.2 enabled OK (python, jupyterlab_pygments)
        nbdime-jupyterlab v2.1.1 enabled OK
        @jupyterlab/git v0.41.0 enabled OK (python, jupyterlab-git)

Other labextensions (built into JupyterLab)
   app dir: /home/michael/miniconda3/envs/jupgit/share/jupyter/lab

• Git version:
  git version 2.34.1
• Operating System and its version:
  Ubuntu 22.04

[GrigoriiTarasov]

The error persist on newer version
jupyterlab-git 0.50.0 pyhd8ed1ab_1 conda-forge