Skip to content

Label unmerged changes in workspace view #897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2025
Merged

Label unmerged changes in workspace view #897

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13ef2aa
fix: label unmerged changes in workspace view
isc-pbarton Nov 11, 2025
c0ce171
Merge branch 'main' into label-merge-conflicts
isc-pbarton Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions git-webui/release/share/git-webui/webui/css/git-webui.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
7 changes: 7 additions & 0 deletions git-webui/src/share/git-webui/webui/css/git-webui.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,13 @@ body {
right: 5px;
}

.U::after {
content: "Unmerged";
position: absolute;
right: 5px;
color: red;
}

.other-user-label svg {
margin-right: 5px;
}
Expand Down
2 changes: 1 addition & 1 deletion module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading