User talk:Xenwolf: Difference between revisions

Line 577:

Sorry for the confusion Wolf, could you perhaps walk SA through the procedure of how to deal with those edit conflicts in which it's your own comments that get lost? I now think that advice for that particular scenario is what SA was asking for initially, but I misunderstood him as asking about why it is that some edit conflicts happen and why they eliminate one person's comments at one time and the other person's comments at another time. --[[User:Aura|Aura]] ([[User talk:Aura|talk]]) 07:06, 9 December 2020 (UTC)

: The wiki software is not a valid forum or chat surrogate. It's optimized for collaboratively editing content. There is a chat linked in the side bar, maybe this could be populated to, but others may be even better. --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)

: Edit conflicts typically happen if editors work through an intended plan save by save, but this plan isn't visible to others. The wiki software ''traditionally''<sup>(see below)</sup> detects conflicts by comparing the base revision of your edit with the last saved revision. In case the last save was after you started editing, you get a warning when you hit [Save changes], this warning includes two boxes, the upper is the text of you collision "opponent", the lower is your text. You may now resolve the conflict by hand. I personally prefer to copy my text before saving (especially in talks with Aura, no offense intended, I just do it, also in other circumstances on other MediaWiki-based wikis). Another option is to copy your changes from the lower box into the upper box, then save it, than apply the "opponent's" edit by help of the history (this option has the downside that others already saw your edit and will probably try the same in parallel). You can (and perhaps should) deliberately provoke an editing conflict by performing two edits in the described manner on a personal page (i.e. in your own user namespace) with two browser tabs. This way the aspects will be much clearer to you than from my dry description. --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)

: I know that there are platforms that are much better in formal conflict resolution (i.e. merging edits), especially the git-based wiki solutions. But this doesn't help here. MediaWiki has many advantages but as a community project itself it's road map looks somewhat unprofessional to developers new to it. (BTW: they'll move to [[GitLab]] soon) --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)

: I said ''traditionally'' because the wiki software obviously had improvements in this aspect. I know of "edit conflicts" that have been silently resolved maybe in other sections, maybe if the line distance is higher than one. After the upgrade to 1.35, also the change diffs look different than before, that is, more helpful. --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)

== SoundCloud ==

@@ Line 577: / Line 577: @@
 Sorry for the confusion Wolf, could you perhaps walk SA through the procedure of how to deal with those edit conflicts in which it's your own comments that get lost?  I now think that advice for that particular scenario is what SA was asking for initially, but I misunderstood him as asking about why it is that some edit conflicts happen and why they eliminate one person's comments at one time and the other person's comments at another time. --[[User:Aura|Aura]] ([[User talk:Aura|talk]]) 07:06, 9 December 2020 (UTC)
+: The wiki software is not a valid forum or chat surrogate. It's optimized for collaboratively editing content. There is a chat linked in the side bar, maybe this could be populated to, but others may be even better. --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)
+: Edit conflicts typically happen if editors work through an intended plan save by save, but this plan isn't visible to others. The wiki software ''traditionally''<sup>(see below)</sup> detects conflicts by comparing the base revision of your edit with the last saved revision. In case the last save was after you started editing, you get a warning when you hit [Save changes], this warning includes two boxes, the upper is the text of you collision "opponent", the lower is your text. You may now resolve the conflict by hand. I personally prefer to copy my text before saving (especially in talks with Aura, no offense intended, I just do it, also in other circumstances on other MediaWiki-based wikis). Another option is to copy your changes from the lower box into the upper box, then save it, than apply the "opponent's" edit by help of the history (this option has the downside that others already saw your edit and will probably try the same in parallel). You can (and perhaps should) deliberately provoke an editing conflict by performing two edits in the described manner on a personal page (i.e. in your own user namespace) with two browser tabs. This way the aspects will be much clearer to you than from my dry description. --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)
+: I know that there are platforms that are much better in formal conflict resolution (i.e. merging edits), especially the git-based wiki solutions. But this doesn't help here. MediaWiki has many advantages but as a community project itself it's road map looks somewhat unprofessional to developers new to it. (BTW: they'll move to [[GitLab]] soon) --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)
+: I said ''traditionally'' because the wiki software obviously had improvements in this aspect. I know of "edit conflicts" that have been silently resolved maybe in other sections, maybe if the line distance is higher than one. After the upgrade to 1.35, also the change diffs look different than before, that is, more helpful. --[[User:Xenwolf|Xenwolf]] ([[User talk:Xenwolf|talk]]) 08:49, 9 December 2020 (UTC)
 == SoundCloud ==