Hello, it is possible that I did not really understand the tool, but it does not help me much. I had a conflict and did not want to choose between my and the other edits. Both were fine. I wanted to have both published, and as the edits happened in two different sections of the page, I think that should be possible. But well, I had to do what I always did: copy my source text, reopen the page and paste my source text. No advantage over the old system.
Topic on Help talk:Paragraph-based Edit Conflict Interface
Thanks for letting us know. Feedback like this is very welcome. Can you please let us know which exact page on which wiki you edited when you run into this situation?
I'm not sure I understand the issue. The edit appears to be pretty massive, basically touching the entire page. As far as I can see it was not made by editing a section, but by editing the whole page. These appear to be the two other edits that have been made in the meantime. (Update: I tried to reproduce this locally, and these edits don't lead to a conflict.) If it's true that your edit also contained these sections, but in an older version, an edit conflict is to be expected then. The idea of the new edit conflict interface is to be able to select both the two new versions these other edits created, as well as your new version.
I think the issue might be that consecutive paragraphs are merged into bigger chunks, and the interface did not gave you the possibility to have fine-grained control over which paragraph to pick from which side. Could that be? Are you able to provide a screenshot?
Sorry - wrong link. I meant this one: https://de.wikipedia.org/w/index.php?title=Wikipedia:Kurier&diff=prev&oldid=183119667&diffmode=source
It was one contribution in one section, while a different section was edited by someone else. Thanks for your time.
Thanks for the follow up! I believe I was able to reproduce the situation you run into. I might miss something, but what I have seen so far is all expected behavior. This is what happened, as far as I understood it:
- Your edit was meant to add a section directly below "Inhalt der rechten Spalte", just as this diff shows.
- At the same time another user moved a section between the two columns, as seen in this diff. This edit touched the same line directly below "Inhalt der rechten Spalte". There must be a conflict because of this.
- In my replay of this situation I got a conflict resolution screen as I would expect it. It showed the moved section being in conflict with the new section.
I understand that neither picking the left side (the new section would get lost), nor the right (this would undo the move) can solve such a conflict. We will keep this in mind and think of ways to deal with such a situation.
What the interface currently allows is this: Make sure the left side with the other users version is selected for all sections. Then copy your new section from the right side and paste it into one of the small text editors on the left side. Don't replace the text in the text editor, but insert your section exactly where you want it to appear. This might not be that convenient, but worked in my replay.
Hey, thank you very much for your explanations! I think I will deal easier now with the problem in future cases!