From 13ef2aabd1edb0959d9a26473c8bf5ecf9734f0f Mon Sep 17 00:00:00 2001
From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com>
Date: Tue, 11 Nov 2025 15:23:52 -0500
Subject: [PATCH] fix: label unmerged changes in workspace view

---
 CHANGELOG.md                                              | 5 +++++
 git-webui/release/share/git-webui/webui/css/git-webui.css | 6 ++++++
 git-webui/src/share/git-webui/webui/css/git-webui.less    | 7 +++++++
 module.xml                                                | 2 +-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9461ee15..8dfac21b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.15.0] - Unreleased
+
+## Fixed
+- Web UI workspace view labels changes as Unmerged if there are merge conflicts (#890)
+
 ## [2.14.0] - 2025-11-07
 
 ### Added
diff --git a/git-webui/release/share/git-webui/webui/css/git-webui.css b/git-webui/release/share/git-webui/webui/css/git-webui.css
index 6fb8f185..bc9565a5 100644
--- a/git-webui/release/share/git-webui/webui/css/git-webui.css
+++ b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -981,6 +981,12 @@ body {
   position: absolute;
   right: 5px;
 }
+#changedFilesContainer .file-area .U::after {
+  content: "Unmerged";
+  position: absolute;
+  right: 5px;
+  color: red;
+}
 #changedFilesContainer .file-area .other-user-label svg {
   margin-right: 5px;
 }
diff --git a/git-webui/src/share/git-webui/webui/css/git-webui.less b/git-webui/src/share/git-webui/webui/css/git-webui.less
index b83a8bb2..e5a9e3ea 100644
--- a/git-webui/src/share/git-webui/webui/css/git-webui.less
+++ b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -984,6 +984,13 @@ body {
             right: 5px;
         }
 
+        .U::after {
+            content: "Unmerged";
+            position: absolute;
+            right: 5px;
+            color: red;
+        }
+
         .other-user-label svg {
             margin-right: 5px;
         }
diff --git a/module.xml b/module.xml
index f330512c..91ff4754 100644
--- a/module.xml
+++ b/module.xml
@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.14.0</Version>
+      <Version>2.15.0</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>