Copying from the discussion thread,

losing one's edited text is horrifying. Preventing that should be prio #1.

I agree, and I think we should do another round of design cleanup before making the TwoColConflict feature default. The workflow is not actually about selecting "A" or "B" from the two columns, it's about synthesizing two different changes, so there should always be an edit made, and almost never a simple selection of "your" or the "other" text chunk. I think we have things wrong.

Here's *ahem* a completely different workflow suggestion, I'm just dumping it here for consideration. It glosses over the edit conflict markers, but I'm imagining we include hidden DOM elements which help us do clever things with the resulting content.

I'm now on board with the ticket as originally written.

Need to verify that there is a committed revision even when all of the "other" chunks are selected. Relatedly, do we add a tag to TwoColConflict-assisted revisions?

A related issue: maybe we should also show a warning if a text chunk was edited, but *not* chosen.

This bug may have been fixed by UI changes:

• If no Javascript is present, the interface is loaded with entirely "your" chunks selected.
• With Javascript, the interface has no selections so choosing "other" chunks in every row would be a confirmation in itself.