[Bug 19389] Find better way to handle edit conflicts

https://www.w3.org/Bugs/Public/show_bug.cgi?id=19389

David Kirstein (Frozenice) <frozenice@frozenice.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |frozenice@frozenice.de

--- Comment #4 from David Kirstein (Frozenice) <frozenice@frozenice.de> ---
"that was it" was it though?

I always thought you'd have a chance to merge your edit with the other person's
with the aid of a diff, like described here [1].

I haven't checked edit conflicts on WPD, so semantic forms or such could
interfere with conflict handling. If that's the case it would be best to fix it
so the normal MediaWiki conflict handling can be used (better to merge
wiki-code than to loose everything).

[1] http://en.wikipedia.org/wiki/Help:Edit_conflict

-- 
You are receiving this mail because:
You are the QA Contact for the bug.