Primitive 05 / Conflict

Version conflict modal

Three-way diff modal for resolving a co-edit conflict. Original / Yours / Theirs columns with author chips, edit stats, and merge / keep-mine / keep-theirs actions.

Production answer

Version conflict modal is a reusable Oak Flats Muffler Men UI primitive with documented states, accessibility expectations, theme behavior, and implementation evidence.

Primary CTAReview Version conflict modal states
Generative search brief

Version conflict modal: Three-way diff modal for resolving a co-edit conflict. Original / Yours / Theirs columns with author chips, edit stats, and merge / keep-mine / keep-theirs actions.

Daniel vs Tim · description conflict