dave/storkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

story-kit: start 225_story_surface_merge_conflicts_and_failures_in_the_web_ui

Browse Source
This commit is contained in:
Dave
2026-02-27 09:50:24 +00:00
parent a82838f779
commit 216d0a9a82
1 changed files with 0 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.story_kit/work/2_current/225_story_surface_merge_conflicts_and_failures_in_the_web_ui.md Normal file
View File

@@ -0,0 +1,21 @@
---
name: "Surface merge conflicts and failures in the web UI"
---
# Story 225: Surface merge conflicts and failures in the web UI
## User Story
As a user, I want to see merge conflicts and failures surfaced in the web UI, so that I can understand why a story is stuck in the merge stage without having to check server logs or agent output.
## Acceptance Criteria
- [ ] When mergemaster fails to merge a story, the work item in the merge stage shows a visual failure indicator (e.g. red border or error icon)
- [ ] The failure reason from MergeReport (conflicts, gate failures) is displayed on the work item card or in a detail view
- [ ] Conflict details (file names, conflict type) are shown when available
- [ ] Gate output (clippy/test failures) is shown when the merge failed due to quality gates
- [ ] The failure state persists until the story is retried or moved back to a previous stage
## Out of Scope
- TBD