When getting a conflict on a talk page (because another user has added a comment on the same topic), I would like to be able to "use both", mine after the other (or vice versa, not sure we need both options).
Topic on Help talk:Paragraph-based Edit Conflict Interface
This would be great. The conflict view mainly triggers in cases like this for me. For example, two "!votes" on a page should be added sequentially if they both start with a single #. Or if two people respond to the same talk page comment, both at the ::: level, can set the first registered comment to ::: and the second to ::* to keep at the same level but differentiate the second comment. (Not watching page but ping me as needed)
There is no option to merge conflicting edits, is there? It would be really helpful to add this feature...
Hi, thanks for you inputs and the proposals! I create a phabricator-task for this: T213270, so we have it on our radar and can take a look. Can you also take a look at the ticket if this describes your issue well?
@Draceane: have you noticed that you can edit every section to merge in your edits?
@Michael Schönitzer (WMDE): Thanks for creating the ticket. Meanwhile I did find the workaround with edit-and-copy, but as stated by you, this is unintuitive and ugly.
I would be very happy if this came to fruit. 9 out of 9 times the editing conflicts I have are on talk pages. For now the copy-paste workaround works.