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