From a82838f779a94387b9e1854a360f87ba8bc7a4ab Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 27 Feb 2026 09:50:05 +0000 Subject: [PATCH] story-kit: create 225_story_surface_merge_conflicts_and_failures_in_the_web_ui --- ...ge_conflicts_and_failures_in_the_web_ui.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .story_kit/work/1_upcoming/225_story_surface_merge_conflicts_and_failures_in_the_web_ui.md diff --git a/.story_kit/work/1_upcoming/225_story_surface_merge_conflicts_and_failures_in_the_web_ui.md b/.story_kit/work/1_upcoming/225_story_surface_merge_conflicts_and_failures_in_the_web_ui.md new file mode 100644 index 0000000..d018a94 --- /dev/null +++ b/.story_kit/work/1_upcoming/225_story_surface_merge_conflicts_and_failures_in_the_web_ui.md @@ -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