Page MenuHomePhabricator

Merge non-conflicting edits when edit conflicts are detected
Closed, ResolvedPublic

Description

When a Schema was edited since a user started editing it, but the edits do not conflict (e. g. someone edited the schema text and someone else edited the labels, or they edited labels in different languages), then it would be nice (but not, for now, required) to merge those changes instead of reporting an edit conflict.

Event Timeline

Michael claimed this task.
Michael moved this task from Backlog to Doing on the Shape Expressions Sprint 5 board.

Change 500059 had a related patch set uploaded (by Michael Große; owner: Michael Große):
[mediawiki/extensions/WikibaseSchema@master] Only prevent actually conflicting edits

https://gerrit.wikimedia.org/r/500059

Change 500059 merged by jenkins-bot:
[mediawiki/extensions/WikibaseSchema@master] Only prevent actually conflicting edits

https://gerrit.wikimedia.org/r/500059

Lydia_Pintscher closed this task as Resolved.Apr 8 2019, 8:36 AM
Lydia_Pintscher moved this task from Verification to Done on the Shape Expressions Sprint 5 board.
Lydia_Pintscher added a subscriber: Lydia_Pintscher.

\o/