Merge pull request #897 from intersystems/label-merge-conflicts

Label unmerged changes in workspace view

Author: isc-pbarton

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Import All has been added to public-facing API (#891)
 
+## Fixed
+- Web UI workspace view labels changes as Unmerged if there are merge conflicts (#890)
+
 ## [2.14.0] - 2025-11-07
 
 ### Added

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;
 }

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;
         }