Add option to abort merge in web UI workspace view#899
Merged
isc-pbarton merged 3 commits intomainfrom Nov 14, 2025
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #899 +/- ##
=======================================
Coverage 50.19% 50.19%
=======================================
Files 24 24
Lines 3315 3315
=======================================
Hits 1664 1664
Misses 1651 1651 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
isc-dchui
reviewed
Nov 12, 2025
CHANGELOG.md
Outdated
| - Web UI workspace view now has an option to abort merge in progress (#895) | ||
|
|
||
| ## Fixed | ||
| - Web UI workspace view labels changes as Unmerged if there are merge conflicts (#890) |
Collaborator
There was a problem hiding this comment.
Also should probably update this
isc-dchui
approved these changes
Nov 12, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
resolves #895