I just activated the Paragraph-based Edit Conflict Interface extension. That gives us an editable list of edit collisions when they occur, and lets us choose which edit (the one you made or the other one) to use on a paragraph-by-paragraph basis.
--
Rob Kelk
Sticks and stones can break your bones,
But words can break your heart.
- unknown
Rob Kelk
Sticks and stones can break your bones,
But words can break your heart.
- unknown