Git Web UI: Merge conflicts not apparent in Workspace view

[cambot]

The list of files usually shows "Added" or "Modified", but sometimes there is nothing showing:

One such scenario that causes this is a merge conflict. The diff view only shows this indication after selecting one of these files:

At a minimum, this column should show something like "Conflict". Additionally, it would be nice if you could show the conflicted file and maybe 1) highlight the conflict zones 2) direct users where/how to resolve the conflicts.

If I want to back out of the merge, clicking "Discard" does not fully do that:

$ git status
On branch feature/mybranch
Your branch is up to date with 'origin/feature/mybranch'.

All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

/c/InterSystems/***/mgr/repo/USER(feature/mybranch|MERGING)

Additionally, it would be nice if there were an "Abort Merge" button somewhere that would execute git merge --abort to completely back out of the attempted merge. If you knew you were in a merge conflict state, you could conditionally add an "Abort" button next to Stash/discard:

---

Module Version: 2.13.1
$zv: IRIS for Windows (x86-64) 2025.1 (Build 223U) Tue Mar 11 2025 18:14:42 EDT

[cambot]

follow up question: if a file has merge conflict regions, can/will the embedded git
module load the file without compiling it (so the developer can fix it within Iris rather than on the filesystem)?