Realtime collab · 09

Co-edit conflict banner

Red alert banner shown when two collaborators edited the same field at the same time — side-by-side my-version vs their-version, with keep / override / merge CTAs.

Production answer

Co-edit conflict banner is a reusable Oak Flats Muffler Men UI primitive with documented states, accessibility expectations, theme behavior, and implementation evidence.

Primary CTAReview Co-edit conflict banner states
Generative search brief

Co-edit conflict banner: Red alert banner shown when two collaborators edited the same field at the same time — side-by-side my-version vs their-version, with keep / override / merge CTAs.

Sophie and you conflicted on parts line 5
Jordan and you conflicted on labour rate
Behaviour

Banner is role="alert" so it announces immediately on first render. Both versions are shown verbatim so the viewer can see exactly what diverged. Keep-mine / keep-theirs are tone-coded teal vs amber; merge opens a compare view via the red footer button.