Change Details

**Motivation** The [[ https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View | Two-Column-Edit-Conflict-View extension ]] is a (soon to be default) beta feature that offers a different way to solve edit conflicts. Since [[ https://grafana.wikimedia.org/d/000000213/mediawiki-edit-conflicts?refresh=1m&orgId=1&var-interval=30d&from=now-30d&to=now | most edit conflicts happen in the main namespace ]] the extension is focused on this use case. However, many people are annoyed from running into edit conflicts on talk pages, where all they wanted to do is reply to another person, and have this appear underneath. **User story** As a Wikimedia editor, I want to see my comment below conflicting other people's comments, whenever I answer at the same time as them, so that I don't need to deal with edit conflicts **Mock** {F31687153} **Acceptance Criteria** [] If there is exactly one change on the page, and the page is a talk page, and the changes were attempted to be at the exact same spot, then we show users a suggestion to solve this (see mock) [] On the page, there should be an explanatory graphic and text (as in the mock). [] If users click on "apply changes", their text will be pasted immediately under the conflicting one. [] If users choose "No, open the edit conflict page", they will see the usual edit conflict resolution screen of the Two-Col-Conflict extension. [] Below the buttons, there is a preview of how the merged text would look like (ideally rendered as the page that would be produced) **Nice to haves** [] There is a per wiki configurable message that allows communities to define their edit conflict marker (e.g.** (EC)**). If this was filled for a community, it should be added to the beginning of the user's text. [] If people want to leave the page without choosing either of the two options, they should see a browser warning that their content would be lost.

**Motivation** The [[ https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View | Two-Column-Edit-Conflict-View extension ]] is a (soon to be default) beta feature that offers a different way to solve edit conflicts. Since [[ https://grafana.wikimedia.org/d/000000213/mediawiki-edit-conflicts?refresh=1m&orgId=1&var-interval=30d&from=now-30d&to=now | most edit conflicts happen in the main namespace ]] the extension is focused on this use case. However, many people are annoyed from running into edit conflicts on talk pages, where all they wanted to do is reply to another person, and have this appear underneath. **User story** As a Wikimedia editor, I want to see my comment below conflicting other people's comments, whenever I answer at the same time as them, so that I don't need to deal with edit conflicts **Mock** {F31687153} **Acceptance Criteria** [] If there is exactly one change on the page, and the page is a talk page, and the changes were attempted to be at the exact same spot, then we show users a suggestion to solve this (see mock) [] When the user is getting into that edit conflict for talk pages for the first time s/he will be shown a popup explaining the circumstances and how to deal with them (similar to the regular edit conflict). This popup can be disabled for future scenarios. (Mock to be delivered) [] If users don't take any action and click on "apply changes", their text will be pasted immediately under the conflicting one. [] If users choose to take action they can do the following: [] users are able to drag and drop their or the other users comment to change the order of these two. This will only be possible for the two conflicting comments and only in in the specific spot the conflict occured. [] users are able to edit their own comment by clicking the edit pen. They wont be able to edit the other users comment. This would need to be done in a separate edit if wished for. [] Users should be able to get a preview before publishing the edit. **Nice to haves** [] There is a per wiki configurable message that allows communities to define their edit conflict marker (e.g.** (EC)**). If this was filled for a community, it should be added to the beginning of the user's text. [] If people want to leave the page without clicking the "publish" button, they should see a browser warning that their content would be lost.

**Motivation** The [[ https://www.mediawiki.org/wiki/Help:Two_Column_Edit_Conflict_View | Two-Column-Edit-Conflict-View extension ]] is a (soon to be default) beta feature that offers a different way to solve edit conflicts. Since [[ https://grafana.wikimedia.org/d/000000213/mediawiki-edit-conflicts?refresh=1m&orgId=1&var-interval=30d&from=now-30d&to=now | most edit conflicts happen in the main namespace ]] the extension is focused on this use case. However, many people are annoyed from running into edit conflicts on talk pages, where all they wanted to do is reply to another person, and have this appear underneath. **User story** As a Wikimedia editor, I want to see my comment below conflicting other people's comments, whenever I answer at the same time as them, so that I don't need to deal with edit conflicts **Mock** {F31687153} **Acceptance Criteria** [] If there is exactly one change on the page, and the page is a talk page, and the changes were attempted to be at the exact same spot, then we show users a suggestion to solve this (see mock) [] On the page,When the user is getting into that edit conflict for talk pages for the first time s/he will be shown a popup explaining the circumstances and how to deal with them (similar to the regular edit conflict). This popup can be disabled for future scenarios. there should(Mock to be an explanatory graphic and text (as in the mock).delivered) [] If users don't take any action and click on "apply changes", their text will be pasted immediately under the conflicting one. [] If users choose "No, open the edit conflict page", they will see the usual edit conflict resolution screen ofto take action they can do the Two-Col-Conflict extension.following: [] Below the buttons, [] users are able to drag and drop their or the other users comment to change the order of these two. This will only be possible for the two conflicting comments and only in in the specific spot the conflict occured. [] users are able to edit their own comment by clicking the edit pen. They wont be able to edit the other users comment. there is a preview of how the merged text would look like (ideally rendered as the page that would be produced)This would need to be done in a separate edit if wished for. [] Users should be able to get a preview before publishing the edit. **Nice to haves** [] There is a per wiki configurable message that allows communities to define their edit conflict marker (e.g.** (EC)**). If this was filled for a community, it should be added to the beginning of the user's text. [] If people want to leave the page without choosclicking either of the two optionsthe "publish" button, they should see a browser warning that their content would be lost.