Topic on Help talk:Two Column Edit Conflict View

Jump to navigation Jump to search
Summary by Michael Schönitzer (WMDE)

On our radar.

Atsme (talkcontribs)

Scenario: user or article TP discussion - click on save comment...edit conflict window appears...choose my text to add, thinking it will be added either above or below the conflicted text. Instead, it deletes the conflicted text and adds mine in its place. Why isn’t it simply added above or below the conflicted text instead of deleting one or the other? The tool doesn’t resolve the conflict, it creates one. ~~~~

Michael Schönitzer (WMDE) (talkcontribs)

Hi, thanks for the input. The conflict resolution algorithms can't (yet) detect when two answers have been added independently, since it's working paragraph-wise not linewise. Therefore the conflict resolution pages is shown. The current work-flow would be to merge the two versions by selecting one and copying the other additions to it. There is already a ticket for improving this T213270 – I added a link to your input.