Topic on Help talk:Two Column Edit Conflict View

Jump to navigation Jump to search

How do I review after solving the conflict?

7
Summary by Johanna Strodt (WMDE)

There is no "Review changes" button in the new interface, because the two-column layout in itself is an (editable) diff view.

Omotecho (talkcontribs)

Great update, and completely impressed with the new experience; pretty time saving to solve conflict. By the way, the "Review changes" button does not seem to work, after I have chosen which edit version either on the left or on the rightside column. Is it final when I check either box, I mean, do I have to correct other things before solving ediitng conflict as in this edit? Anyway, thank you so much for your hard work, guys :)

Johanna Strodt (WMDE) (talkcontribs)

@Omotecho Thanks a lot for this feedback! It seems in fact that something is broken with the "Review changes" button. I've filed a bug report for T216742

Thanks again!

Johanna

Johanna Strodt (WMDE) (talkcontribs)

@Omotecho It turns out I was wrong. For some reason, I confused the "Review changes" with the "Preview" button yesterday. Sorry about that!

So, the correct information is: The "Review changes" button doesn't work because it doesn't exist in the new interface anymore. That's because technically speaking the two-column layout is basically an editable diff view. As in the diff view, you see all of the changes between the two versions in yellow and blue, and all of the unchanged text in grey. To compose the version you want to publish, you select the text passages you want to keep, and click on "Publish". That's it. Optionally, you can edit the text in the selected text boxes, and also in the grey text boxes.

I hope this helps.

Best,

Johanna

Omotecho (talkcontribs)

Thank you, Johanna Strodt to taking care of my question, and I am excited to update my skill using two-column preview:

  • I find it very useful as when I choose the rightside box, then the diff is highlighted inside the text box (in my case in blue for the r-column) so that I am assured my choice is correct.
  • The new thing in my guess, before on-hand experiment myself: I will click on the right column in two-column display during checking edit conflict, and I will edit in that display; I used to go back to editing mode prior to the current update. (If my guess is right, then it's worth to announce to the users using Tech News, isn't it?)
Johanna Strodt (WMDE) (talkcontribs)

@Omotecho Yes, in this new interface, you can edit directly in the two-column display without going to back to a separate editing page. Right now, the feature is in beta phase. We've announced it quite a bit already, including Tech News, and we'll announce it again once it becomes a default feature for everyone.

Have a good week!


Omotecho (talkcontribs)

Case solved for me. Wonderful! Can’t wait to translate messages on this topic on future Tech News issues, appreciating your hard work and very inventive solution for maximising human and time resource for editors  :) Enjoy good meal.

Johanna Strodt (WMDE) (talkcontribs)

Thanks a lot! I'll pass this on to the rest of the team. :)