daniel created this task.
daniel triaged this task as "Normal" priority.
daniel added projects: Wikidata, Structured-Data-Commons, MediaWiki-Platform-Team, Multi-Content-Revisions.

TASK DESCRIPTION

Edit conflict resolution needs to take into consideration all slots. Extra slots must not be ignored, otherwise edits may be silently overwritten.

Edit conflict resolution has two stages, which need to be considered and implemented separately:

  1. automatic conflict resolution via a 3-way-merge
  2. in case of merge conflicts, used mediated interactive resolution.

To fully satisfy this ticket, mediated interactive resolution has to work for all slots, and has to work for edits that change multiple slots at once. However, as a temporary base line, it may be acceptable to only implement automatic resolution multi-slot and non-main-slot edits, and reject the edit if automatic merging fails.


TASK DETAIL
https://phabricator.wikimedia.org/T194734

EMAIL PREFERENCES
https://phabricator.wikimedia.org/settings/panel/emailpreferences/

To: daniel
Cc: Aklapper, -jem-, Lokal_Profil, Smalyshev, TomT0m, Liuxinyu970226, Agabi10, daniel, Lahi, PDrouin-WMF, Gq86, E1presidente, Ramsey-WMF, Cparle, SandraF_WMF, GoranSMilovanovic, QZanden, Tramullas, Acer, LawExplorer, JJMC89, Susannaanas, Aschroet, Fjalapeno, Jane023, Wikidata-bugs, PKM, Base, matthiasmullie, aude, Ricordisamoa, Lydia_Pintscher, Fabrice_Florin, Raymond, Anomie, Steinsplitter, Mbch331
_______________________________________________
Wikidata-bugs mailing list
Wikidata-bugs@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/wikidata-bugs

Reply via email to