Description
Problem
The jupyterlab-git users I support have been having trouble resolving merge conflicts using the existing UI.
For example, right-clicking or hovering over a conflicted file in the "Conflicted" section only offers a "Diff" fucntion, which opens a read-only view of the conflicts:
This view is read-only, and yet this is the only way to access the "Mark as resolved" function. It should be easier to get from this state to "I can make the changes needed to resolve the conflicts and then Mark as resolved."
Describe the solution you'd like
jupyterlab-git should provide a merge UI where you can resolve the conflicts, more like https://gnome.pages.gitlab.gnome.org/meld/ or https://code.visualstudio.com/docs/sourcecontrol/overview#_3way-merge-editor to make it easier to resolve conflicts.